Merge "Fix spacing and align in drawer" into jb-ub-mail-ur9
diff --git a/res/layout/conversation_list.xml b/res/layout/conversation_list.xml
index 9835ca1..e4ad9ca 100644
--- a/res/layout/conversation_list.xml
+++ b/res/layout/conversation_list.xml
@@ -22,53 +22,69 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <!-- Note: intentionally not called "empty" because we call
- setEmptyView programmatically-->
- <!-- Offset by height of undo bar and action bar -->
- <TextView
- android:id="@+id/empty_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/no_conversations"
- android:layout_marginTop="@dimen/empty_view_top_padding"
- android:visibility="gone" />
+ <!-- Note: intentionally not called "empty" because we call
+ setEmptyView programmatically-->
+ <!-- Offset by height of undo bar and action bar -->
+ <TextView
+ android:id="@+id/empty_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/no_conversations"
+ android:layout_marginTop="@dimen/empty_view_top_padding"
+ android:visibility="gone" />
- <include layout="@layout/search_results_view"/>
+ <include layout="@layout/search_results_view"/>
- <com.android.mail.ui.ConversationListView android:id="@+id/conversation_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <com.android.mail.ui.ConversationListView
+ android:id="@+id/conversation_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <com.android.mail.ui.SwipeableListView android:id="@android:id/list"
- style="@style/ConversationListFade"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fadingEdge="none"
- android:layout_alignParentTop="true"/>
+ <com.android.mail.ui.SwipeableListView android:id="@android:id/list"
+ style="@style/ConversationListFade"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fadingEdge="none"
+ android:layout_alignParentTop="true"/>
+ <!-- white background to make blue progress bar more visible -->
+ <FrameLayout
+ android:id="@+id/sync_trigger"
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:layout_gravity="top|center"
+ android:background="#ffffff"
+ android:visibility="gone">
- <ProgressBar
- android:id="@+id/sync_trigger"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="top|center"
- android:max="100"
- android:progress="100"
- android:progressDrawable="@drawable/progressbar_solid_holo"
- android:visibility="gone" />
+ <ProgressBar
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:max="100"
+ android:progress="100"
+ android:progressDrawable="@drawable/progressbar_solid_holo" />
+ </FrameLayout>
- <ProgressBar
- android:id="@+id/progress"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:visibility="gone"
- android:indeterminateDrawable="@drawable/progress_indeterminate_horizontal_holo"
- android:indeterminate="true" />
+ <!-- white background to make blue progress bar more visible -->
+ <FrameLayout
+ android:id="@+id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:layout_gravity="top"
+ android:background="#ffffff"
+ android:visibility="gone">
- </com.android.mail.ui.ConversationListView>
+ <ProgressBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:indeterminateDrawable="@drawable/progress_indeterminate_horizontal_holo"
+ android:indeterminate="true" />
+ </FrameLayout>
+
+ </com.android.mail.ui.ConversationListView>
</RelativeLayout>
diff --git a/res/layout/swipe_to_refresh.xml b/res/layout/swipe_to_refresh.xml
new file mode 100644
index 0000000..a95d4e3
--- /dev/null
+++ b/res/layout/swipe_to_refresh.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/swipe_text"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="#62b5e5"
+ android:textSize="18sp" />
+
+</FrameLayout>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 49d6a5d..5c562a7 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -1392,9 +1392,9 @@
}
private boolean isTouchInContactPhoto(float x) {
- // Everything before senders and include a touch slop.
+ // Everything before the right edge of contact photo
return (mHeader.gadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
- && x < mCoordinates.sendersX + sTouchSlop);
+ && x < (mCoordinates.contactImagesX + mCoordinates.contactImagesWidth));
}
private boolean isTouchInStar(float x, float y) {
diff --git a/src/com/android/mail/ui/ConversationListView.java b/src/com/android/mail/ui/ConversationListView.java
index 0e9cc69..16fc4ea 100644
--- a/src/com/android/mail/ui/ConversationListView.java
+++ b/src/com/android/mail/ui/ConversationListView.java
@@ -8,12 +8,15 @@
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.TypedValue;
+
import android.view.Gravity;
+import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import android.widget.TextView;
@@ -34,7 +37,12 @@
private static final int DISTANCE_TO_IGNORE = 15; // dp
private static final int DISTANCE_TO_TRIGGER_CANCEL = 10; // dp
private static final int SHOW_CHECKING_FOR_MAIL_DURATION_IN_MILLIS = 1 * 1000; // 1 seconds
- private static final int TEXT_FADE_DURATION_IN_MILLIS = 300;
+
+ private static final int ACTION_BAR_FADE_DURATION_IN_MILLIS = 100;
+ private static final int SWIPE_TEXT_APPEAR_DURATION_IN_MILLIS = 100;
+ private static final int SWIPE_TEXT_FADE_DURATION_IN_MILLIS = 300;
+ private static final int SYNC_STATUS_BAR_FADE_DURATION_IN_MILLIS = 150;
+ private static final int SYNC_TRIGGER_SHRINK_DURATION_IN_MILLIS = 250;
private static final String LOG_TAG = LogTag.getLogTag();
@@ -53,7 +61,9 @@
// sync trigger bar.
private float mTrackingScrollMaxY;
private boolean mIsSyncing = false;
- private Interpolator mInterpolator = new AccelerateInterpolator();
+
+ private Interpolator mAccelerateInterpolator = new AccelerateInterpolator(1.5f);
+ private Interpolator mDecelerateInterpolator = new DecelerateInterpolator(1.5f);
private FolderController mFolderController = null;
@@ -196,7 +206,7 @@
} else {
mHintText.displaySwipeToRefresh();
}
- mSyncTriggerBar.setScaleX(mInterpolator.getInterpolation(
+ mSyncTriggerBar.setScaleX(mAccelerateInterpolator.getInterpolation(
verticalDistanceDp/mDistanceToTriggerSyncDp));
if (y > mTrackingScrollMaxY) {
@@ -227,8 +237,9 @@
private void cancelMovementTracking() {
if (mTrackingScrollMovement) {
- // Fade out the status bar when user lifts finger and no sync has happened yet
- mSyncTriggerBar.animate().alpha(0f).setDuration(200).start();
+ // Shrink the status bar when user lifts finger and no sync has happened yet
+ mSyncTriggerBar.animate().scaleX(0f).setInterpolator(mDecelerateInterpolator)
+ .setDuration(SYNC_TRIGGER_SHRINK_DURATION_IN_MILLIS).start();
}
mTrackingScrollMovement = false;
mHintText.hide();
@@ -247,11 +258,14 @@
}
protected void showSyncStatusBar() {
- mIsSyncing = true;
+ if (!mIsSyncing) {
+ mIsSyncing = true;
- LogUtils.i(LOG_TAG, "ConversationListView show sync status bar");
- mSyncTriggerBar.setVisibility(GONE);
- mSyncProgressBar.setVisibility(VISIBLE);
+ LogUtils.i(LOG_TAG, "ConversationListView show sync status bar");
+ mSyncTriggerBar.setVisibility(GONE);
+ mSyncProgressBar.setVisibility(VISIBLE);
+ mSyncProgressBar.setAlpha(1f);
+ }
}
protected void onSyncFinished() {
@@ -260,7 +274,8 @@
if (mIsSyncing) {
LogUtils.i(LOG_TAG, "ConversationListView hide sync status bar");
// Hide both the sync progress bar and sync trigger bar
- mSyncProgressBar.setVisibility(GONE);
+ mSyncProgressBar.animate().alpha(0f)
+ .setDuration(SYNC_STATUS_BAR_FADE_DURATION_IN_MILLIS);
mSyncTriggerBar.setVisibility(GONE);
mIsSyncing = false;
}
@@ -283,12 +298,15 @@
Window window = mActivity.getWindow();
window.getDecorView().getWindowVisibleDisplayFrame(rect);
int statusBarHeight = rect.top;
- int contentViewTop=
- window.findViewById(Window.ID_ANDROID_CONTENT).getTop();
- int titleBarHeight= contentViewTop - statusBarHeight;
+
+ final TypedArray actionBarSize = mActivity.obtainStyledAttributes(
+ new int[] { android.R.attr.actionBarSize });
+ int actionBarHeight = actionBarSize.getDimensionPixelSize(0, 0);
+ actionBarSize.recycle();
+
WindowManager.LayoutParams params = new WindowManager.LayoutParams(
WindowManager.LayoutParams.MATCH_PARENT,
- titleBarHeight,
+ actionBarHeight,
WindowManager.LayoutParams.TYPE_APPLICATION_PANEL,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT);
@@ -302,7 +320,7 @@
* A test view that covers the entire action bar, used for displaying
* "Swipe down to refresh" hint text if user has initiated a downward swipe.
*/
- protected static class HintText extends TextView {
+ protected static class HintText extends FrameLayout {
private static final int NONE = 0;
private static final int SWIPE_TO_REFRESH = 1;
@@ -311,8 +329,25 @@
// Can be one of NONE, SWIPE_TO_REFRESH, CHECKING_FOR_MAIL
private int mDisplay;
+ private TextView mTextView;
+
+ private Interpolator mDecelerateInterpolator = new DecelerateInterpolator(1.5f);
+
public HintText(final Context context) {
- super(context);
+ this(context, null);
+ }
+
+ public HintText(final Context context, final AttributeSet attrs) {
+ this(context, attrs, -1);
+ }
+
+ public HintText(final Context context, final AttributeSet attrs, final int defStyle) {
+ super(context, attrs, defStyle);
+
+ final LayoutInflater factory = LayoutInflater.from(context);
+ factory.inflate(R.layout.swipe_to_refresh, this);
+
+ mTextView = (TextView) findViewById(R.id.swipe_text);
mDisplay = NONE;
setVisibility(View.GONE);
@@ -332,23 +367,26 @@
// Default color
setBackgroundColor(R.color.list_background_color);
}
-
- setTextAppearance(context, android.R.attr.textAppearanceMedium);
- setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
}
private void displaySwipeToRefresh() {
if (mDisplay != SWIPE_TO_REFRESH) {
- setText(getResources().getText(R.string.swipe_down_to_refresh));
+ mTextView.setText(getResources().getText(R.string.swipe_down_to_refresh));
setVisibility(View.VISIBLE);
+ // Fade out the current action bar first:
setAlpha(0f);
- animate().alpha(1f).setDuration(TEXT_FADE_DURATION_IN_MILLIS).start();
+ animate().alpha(1f).setDuration(ACTION_BAR_FADE_DURATION_IN_MILLIS);
+ // Then animate text sliding down onto action bar:
+ mTextView.setY(-mTextView.getHeight());
+ mTextView.animate().y(0).setStartDelay(ACTION_BAR_FADE_DURATION_IN_MILLIS)
+ .setInterpolator(mDecelerateInterpolator)
+ .setDuration(SWIPE_TEXT_APPEAR_DURATION_IN_MILLIS);
mDisplay = SWIPE_TO_REFRESH;
}
}
private void displayCheckingForMailAndHideAfterDelay() {
- setText(getResources().getText(R.string.checking_for_mail));
+ mTextView.setText(getResources().getText(R.string.checking_for_mail));
setVisibility(View.VISIBLE);
mDisplay = CHECKING_FOR_MAIL;
postDelayed(new Runnable() {
@@ -361,13 +399,13 @@
private void hide() {
if (mDisplay != NONE) {
- animate().alpha(0f).setDuration(TEXT_FADE_DURATION_IN_MILLIS).start();
+ animate().alpha(0f).setDuration(SWIPE_TEXT_FADE_DURATION_IN_MILLIS).start();
postDelayed(new Runnable() {
@Override
public void run() {
setVisibility(View.GONE);
}
- }, TEXT_FADE_DURATION_IN_MILLIS);
+ }, SWIPE_TEXT_FADE_DURATION_IN_MILLIS);
mDisplay = NONE;
}
}