Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a85b789a authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents f95e8c5b 8932ff6d

core/res/res/anim/lock_screen_behind_enter.xml

+25 −12
Original line number Diff line number Diff line
@@ -17,7 +17,20 @@ 
*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/accelerate_cubic">

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

            android:duration="@android:integer/config_activityDefaultDur" />

<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:detachWallpaper="true" android:shareInterpolator="false">

    <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>
 
 No newline at end of file

core/res/res/anim/lock_screen_exit.xml

+23 −12
Original line number Diff line number Diff line
@@ -18,7 +18,18 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@interpolator/decelerate_cubic">

	<alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:duration="@android:integer/config_activityDefaultDur" />

    android:zAdjustment="top"

    android:shareInterpolator="false">

    <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>
 
 No newline at end of file