summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-27 22:36:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 22:36:54 +0000
commit4d3540c5594f4330d46604dda1480bda707321ea (patch)
treecba855ee55d159ca06e49ab72e1e376286382cd4 /res
parent3c2c42212368b08dee289a2457377a61da4b8caf (diff)
parentaa512e3ba153f5847f8d0c184c358d44590f91b4 (diff)
Merge "Use custom path interpolators for dialpad slide in/out." into lmp-preview-dev
Diffstat (limited to 'res')
-rw-r--r--res/anim/slide_in.xml2
-rw-r--r--res/anim/slide_out.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml
index 9f9c4d4c7..56318e429 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 e77bcde06..1cd39a7a6 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