diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-27 23:21:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-27 23:21:21 +0000 |
| commit | 8da3cebbdd02c3ded0c9156c98b16cb572b41293 (patch) | |
| tree | 2e3f3a8e2cd863fc25f950ba86997c4466f1b57f /InCallUI | |
| parent | 2e60f36fbdfdda01038e486d114c2d6dfc7d7ed2 (diff) | |
| parent | 3d73e945307057b15292e5d3af030952b7f62bbc (diff) | |
am 364a0512: Merge "Use custom path interpolators for dialpad slide in/out." into lmp-preview-dev
* commit '364a0512d38dd92ebca48d5c8790037a8cfa41aa':
Use custom path interpolators for dialpad slide in/out.
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_in.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_out.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/anim/incall_dialpad_slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml index 0e8ffce1f..a1d3f63be 100644 --- a/InCallUI/res/anim/incall_dialpad_slide_in.xml +++ b/InCallUI/res/anim/incall_dialpad_slide_in.xml @@ -14,7 +14,7 @@ limitations under the License. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" + android:interpolator="@interpolator/ease_in_interpolator" android:valueFrom="1.0" android:valueTo="0" android:valueType="floatType" diff --git a/InCallUI/res/anim/incall_dialpad_slide_out.xml b/InCallUI/res/anim/incall_dialpad_slide_out.xml index 313e0b2a3..edc1e4abe 100644 --- a/InCallUI/res/anim/incall_dialpad_slide_out.xml +++ b/InCallUI/res/anim/incall_dialpad_slide_out.xml @@ -14,7 +14,7 @@ limitations under the License. --> <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" + android:interpolator="@interpolator/ease_in_interpolator" android:valueFrom="0" android:valueTo="1.0" android:valueType="floatType" |