diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-08-05 18:23:13 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2014-08-06 12:26:32 -0700 |
| commit | 8403451d612e0d8923aaefc081a28c358775268f (patch) | |
| tree | ed272add81d510c7de805142b4025603add97eec | |
| parent | 15b1df12b7c8379b9efcdf68d8a556bf44ce5930 (diff) | |
| download | android_packages_apps_PhoneCommon-8403451d612e0d8923aaefc081a28c358775268f.tar.gz android_packages_apps_PhoneCommon-8403451d612e0d8923aaefc081a28c358775268f.tar.bz2 android_packages_apps_PhoneCommon-8403451d612e0d8923aaefc081a28c358775268f.zip | |
Set correct interpolator and duration for dialpad animation
Bug: 16659277
Change-Id: Ia8c61220b9278105a59894d326f55fcd309eb5db
| -rw-r--r-- | res/anim/dialpad_slide_in_bottom.xml | 3 | ||||
| -rw-r--r-- | res/anim/dialpad_slide_in_right.xml | 1 | ||||
| -rw-r--r-- | res/anim/dialpad_slide_out_bottom.xml | 3 | ||||
| -rw-r--r-- | res/anim/dialpad_slide_out_right.xml | 1 | ||||
| -rw-r--r-- | res/values/animation_constants.xml | 4 |
5 files changed, 4 insertions, 8 deletions
diff --git a/res/anim/dialpad_slide_in_bottom.xml b/res/anim/dialpad_slide_in_bottom.xml index 07748b5..dfee704 100644 --- a/res/anim/dialpad_slide_in_bottom.xml +++ b/res/anim/dialpad_slide_in_bottom.xml @@ -14,7 +14,6 @@ limitations under the License. --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="@integer/dialpad_slide_in_duration" - android:fromYDelta="67%p" + android:fromYDelta="100%p" android:toYDelta="0" /> diff --git a/res/anim/dialpad_slide_in_right.xml b/res/anim/dialpad_slide_in_right.xml index d87e82a..b53ba00 100644 --- a/res/anim/dialpad_slide_in_right.xml +++ b/res/anim/dialpad_slide_in_right.xml @@ -17,5 +17,4 @@ <translate xmlns:android="http://schemas.android.com/apk/res/android" android:fromXDelta="100%p" android:toXDelta="0" - android:interpolator="@android:anim/decelerate_interpolator" android:duration="@integer/dialpad_slide_in_duration"/> diff --git a/res/anim/dialpad_slide_out_bottom.xml b/res/anim/dialpad_slide_out_bottom.xml index c80c8ed..64c5672 100644 --- a/res/anim/dialpad_slide_out_bottom.xml +++ b/res/anim/dialpad_slide_out_bottom.xml @@ -14,7 +14,6 @@ limitations under the License. --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_linear_in" android:duration="@integer/dialpad_slide_out_duration" android:fromYDelta="0" - android:toYDelta="80%p" /> + android:toYDelta="100%p" /> diff --git a/res/anim/dialpad_slide_out_right.xml b/res/anim/dialpad_slide_out_right.xml index a29c1a0..fe4a4e0 100644 --- a/res/anim/dialpad_slide_out_right.xml +++ b/res/anim/dialpad_slide_out_right.xml @@ -17,5 +17,4 @@ <translate xmlns:android="http://schemas.android.com/apk/res/android" android:fromXDelta="0" android:toXDelta="100%" - android:interpolator="@android:anim/decelerate_interpolator" android:duration="@integer/dialpad_slide_out_duration"/> diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index f8523e3..bd906fb 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -16,6 +16,6 @@ --> <resources> <integer name="floating_action_button_animation_duration">250</integer> - <integer name="dialpad_slide_in_duration">532</integer> - <integer name="dialpad_slide_out_duration">257</integer> + <integer name="dialpad_slide_in_duration">400</integer> + <integer name="dialpad_slide_out_duration">400</integer> </resources> |