summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-29 09:43:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-29 09:43:06 +0000
commit9495a1d3c98f54606122862d4ab4e5327aac0b72 (patch)
treee0efe9db097ea7190988385870def4c5db7c5c52
parent18c183c24415eef160befc28a4c4e5982ad66d64 (diff)
parentbb4a8512997ed3199a5d84f2013e21fc8d7111e8 (diff)
am bb4a8512: Merge "Update dialpad slide in/out animation durations." into lmp-preview-dev
* commit 'bb4a8512997ed3199a5d84f2013e21fc8d7111e8': Update dialpad slide in/out animation durations.
-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 56318e429..b0eed3713 100644
--- a/res/anim/slide_in.xml
+++ b/res/anim/slide_in.xml
@@ -15,6 +15,6 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@interpolator/ease_in_interpolator"
- android:duration="666"
+ android:duration="532"
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 1cd39a7a6..231555e88 100644
--- a/res/anim/slide_out.xml
+++ b/res/anim/slide_out.xml
@@ -15,6 +15,6 @@
-->
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@interpolator/ease_out_interpolator"
- android:duration="429"
+ android:duration="257"
android:fromYDelta="0"
android:toYDelta="80%p" /> \ No newline at end of file