summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-04-13 16:55:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-13 16:55:00 -0700
commit8b2dd9c870ab81f35db8d8cd995c7f428c943e50 (patch)
tree5c292efb3404bc73e50be0f8349dbd96ebd4df18 /core/res
parent48a7bf24e375bb98f6300f0b1b3d4c9b7447443a (diff)
parent9adeb6b98d2e2e9db5081fdd3fb74c7710c3fa66 (diff)
downloadframeworks_base-8b2dd9c870ab81f35db8d8cd995c7f428c943e50.zip
frameworks_base-8b2dd9c870ab81f35db8d8cd995c7f428c943e50.tar.gz
frameworks_base-8b2dd9c870ab81f35db8d8cd995c7f428c943e50.tar.bz2
Merge "Improve lock screen hide animation."
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/anim/lock_screen_behind_enter.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/anim/lock_screen_behind_enter.xml b/core/res/res/anim/lock_screen_behind_enter.xml
index 6b06456..78b7d29 100644
--- a/core/res/res/anim/lock_screen_behind_enter.xml
+++ b/core/res/res/anim/lock_screen_behind_enter.xml
@@ -20,8 +20,8 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false">
<scale
- android:fromXScale="0.95" android:toXScale="1.0"
- android:fromYScale="0.95" android:toYScale="1.0"
+ android:fromXScale="0.90" android:toXScale="1.0"
+ android:fromYScale="0.90" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_cubic"
@@ -30,7 +30,7 @@
<alpha
android:fromAlpha="0.0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true"
- android:interpolator="@interpolator/decelerate_quad"
+ android:interpolator="@interpolator/decelerate_quint"
android:startOffset="@android:integer/config_shortAnimTime"
android:duration="@android:integer/config_shortAnimTime"/>
</set> \ No newline at end of file