Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb

Browse Source
This commit is contained in:
Jim Miller
2011-01-27 17:42:52 -08:00
committed by Android (Google) Code Review
parent f95e8c5bb2 8932ff6d7f
commit a85b789a4a
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/res/res/anim/lock_screen_behind_enter.xml
View File

@@ -17,7 +17,20 @@
*/ */
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/accelerate_cubic"> <set xmlns:android="http://schemas.android.com/apk/res/android"
<alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:detachWallpaper="true" android:shareInterpolator="false">
android:duration="@android:integer/config_activityDefaultDur" /> <scale
android:fromXScale="0.9" android:toXScale="1.0"
android:fromYScale="0.9" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha
android:fromAlpha="0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime"/>
</set> </set>

17
core/res/res/anim/lock_screen_exit.xml
View File

@@ -18,7 +18,18 @@
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android" <set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@interpolator/decelerate_cubic"> android:zAdjustment="top"
<alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:shareInterpolator="false">
android:duration="@android:integer/config_activityDefaultDur" /> <scale
android:fromXScale="1.0" android:toXScale="1.2"
android:fromYScale="1.0" android:toYScale="1.2"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quint"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha
android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="@android:integer/config_mediumAnimTime"/>
</set> </set>