diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-29 16:45:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 16:45:36 +0000 |
| commit | 219d7a50fb7a269fe54dd9d70587c269d217336f (patch) | |
| tree | 89515f6d9a52343ae6eb991d625d447c688c79c2 /core/res | |
| parent | 575510c48f3cad55a4751db89dc44e330b0cc9df (diff) | |
| parent | 0d674623facfbd3e9c520d2be4ed98977b92a1a2 (diff) | |
| download | frameworks_base-219d7a50fb7a269fe54dd9d70587c269d217336f.zip frameworks_base-219d7a50fb7a269fe54dd9d70587c269d217336f.tar.gz frameworks_base-219d7a50fb7a269fe54dd9d70587c269d217336f.tar.bz2 | |
Merge "Add methods to coordinate unlock animation." into lmp-preview-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/anim/lock_screen_behind_enter.xml | 5 | ||||
| -rw-r--r-- | core/res/res/anim/lock_screen_wallpaper_behind_enter.xml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/res/res/anim/lock_screen_behind_enter.xml b/core/res/res/anim/lock_screen_behind_enter.xml index cb47b3c..4a956d7 100644 --- a/core/res/res/anim/lock_screen_behind_enter.xml +++ b/core/res/res/anim/lock_screen_behind_enter.xml @@ -20,9 +20,8 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:background="#ff000000" android:shareInterpolator="false"> <alpha - android:fromAlpha="0.0" android:toAlpha="1.0" + android:fromAlpha="1.0" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:interpolator="@interpolator/decelerate_quint" - android:startOffset="@android:integer/config_shortAnimTime" - android:duration="@android:integer/config_shortAnimTime"/> + android:duration="0"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/lock_screen_wallpaper_behind_enter.xml b/core/res/res/anim/lock_screen_wallpaper_behind_enter.xml index c29fd1a..f7a6a65 100644 --- a/core/res/res/anim/lock_screen_wallpaper_behind_enter.xml +++ b/core/res/res/anim/lock_screen_wallpaper_behind_enter.xml @@ -23,6 +23,6 @@ android:fromAlpha="0.0" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:interpolator="@interpolator/decelerate_quad" - android:startOffset="@android:integer/config_shortAnimTime" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_shortAnimTime"/> </set> |