Merge "Fix NPE caused by null velocity tracker" into lmp-preview-dev
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml
index 9f9c4d4..56318e4 100644
--- a/res/anim/slide_in.xml
+++ b/res/anim/slide_in.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:interpolator/fast_out_slow_in"
+ android:interpolator="@interpolator/ease_in_interpolator"
android:duration="666"
android:fromYDelta="67%p"
android:toYDelta="0" />
\ No newline at end of file
diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml
index e77bcde..1cd39a7 100644
--- a/res/anim/slide_out.xml
+++ b/res/anim/slide_out.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:interpolator/fast_out_slow_in"
+ android:interpolator="@interpolator/ease_out_interpolator"
android:duration="429"
android:fromYDelta="0"
android:toYDelta="80%p" />
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e884566..dc285cf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -61,7 +61,7 @@
<dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
<!-- Dimensions for most recent call shortcut cards -->
- <dimen name="recent_call_log_item_translation_z">5dp</dimen>
+ <dimen name="recent_call_log_item_translation_z">4dp</dimen>
<dimen name="recent_call_log_item_padding">8dp</dimen>
<!-- The maximum amount to clip on the left and right of the recent call shortcut card -->
<dimen name="recent_call_log_item_horizontal_clip_limit">20dp</dimen>
@@ -112,7 +112,7 @@
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
<!-- Elevation of the search box -->
- <dimen name="search_box_elevation">5dp</dimen>
+ <dimen name="search_box_elevation">4dp</dimen>
<!-- Size of text in tabs. -->
<dimen name="tab_height">43dp</dimen>
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 2ff5a2a..229f7f3 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -126,12 +126,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 2 percent from each edge
+ // For every 1 percent that the panel is slid upwards, clip 3 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) * 2f;
+ float ratioCardHidden = (1 - slideOffset) * 3f;
if (mShortcutCardsListView.getCount() > 0) {
SwipeableShortcutCard v =
(SwipeableShortcutCard) mShortcutCardsListView.getChildAt(0);