am aafbb4c4: Merge "Adjust recent cards animation." into lmp-preview-dev
* commit 'aafbb4c4ea8d6ac1f06e4f459a7bcdaa4ca284b6':
Adjust recent cards animation.
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4b955c6..004dc40 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -112,7 +112,7 @@
<!-- Padding around the icon in the search box. -->
<dimen name="search_box_icon_margin">4dp</dimen>
<dimen name="search_box_search_icon_padding">2dp</dimen>
- <dimen name="search_box_collapsed_text_margin_left">24dp</dimen>
+ <dimen name="search_box_collapsed_text_margin_left">22dp</dimen>
<dimen name="search_box_expanded_text_margin_left">26dp</dimen>
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index bdd2d6c..b50f94e 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -135,12 +135,12 @@
private PanelSlideListener mPanelSlideListener = new PanelSlideListener() {
@Override
public void onPanelSlide(View panel, float slideOffset) {
- // For every 1 percent that the panel is slid upwards, clip 3 percent from each edge
+ // For every 1 percent that the panel is slid upwards, clip 1.5 percent from each edge
// of the shortcut card, to achieve the animated effect of the shortcut card
// rapidly shrinking and disappearing from view when the panel is slid upwards.
// slideOffset is 1 when the shortcut card is fully exposed, and 0 when completely
// hidden.
- float ratioCardHidden = (1 - slideOffset) * 3f;
+ float ratioCardHidden = (1 - slideOffset) * 1.5f;
if (mShortcutCardsListView.getCount() > 0) {
SwipeableShortcutCard v =
(SwipeableShortcutCard) mShortcutCardsListView.getChildAt(0);
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index 088535a..dd198ec 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -21,6 +21,7 @@
import android.database.Cursor;
import android.database.DataSetObserver;
import android.graphics.Rect;
+import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
@@ -252,6 +253,7 @@
(CallLogListItemView) view.findViewById(R.id.call_log_list_item);
// Reset the internal call log item view if it is being recycled
callLogItem.setTranslationX(0);
+ callLogItem.setTranslationY(0);
callLogItem.setAlpha(1);
callLogItem.setClipBounds(null);
setChildrenOpacity(callLogItem, 1.0f);
@@ -344,12 +346,17 @@
int newTop = (int) (ratioHidden * height);
int newBottom = (height - newTop);
mClipRect.set(newLeft, newTop, newRight, newBottom);
+
+ // Since the pane will be overlapping with the action bar, apply a vertical offset
+ // to visually center the clipped card in the viewable area;
+ int verticalOffset = -newTop / 2;
+ viewToClip.setTranslationY(verticalOffset);
}
viewToClip.setClipBounds(mClipRect);
// If the view has any children, fade them out of view.
final ViewGroup viewGroup = (ViewGroup) viewToClip;
- setChildrenOpacity(viewGroup, Math.max(0, 1 - 3 * ratioHidden));
+ setChildrenOpacity(viewGroup, Math.max(0, 1 - 4.5f * ratioHidden));
}
private void setChildrenOpacity(ViewGroup viewGroup, float alpha) {