commit 8da3cebbdd02c3ded0c9156c98b16cb572b41293
author Andrew Lee <anwlee@google.com> Tue May 27 23:21:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 27 23:21:21 2014 +0000
tree 2e3f3a8e2cd863fc25f950ba86997c4466f1b57f
parent 2e60f36fbdfdda01038e486d114c2d6dfc7d7ed2
parent 3d73e945307057b15292e5d3af030952b7f62bbc

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.

InCallUI/res/anim/incall_dialpad_slide_in.xml

diff --git a/InCallUI/res/anim/incall_dialpad_slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml
index 0e8ffce..a1d3f63 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"

InCallUI/res/anim/incall_dialpad_slide_out.xml

diff --git a/InCallUI/res/anim/incall_dialpad_slide_out.xml b/InCallUI/res/anim/incall_dialpad_slide_out.xml
index 313e0b2..edc1e4a 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"