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

Commit 6fc22aaa authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am a85b789a: Merge "Fix 3381322: Update transition animation from lockscreen... 

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

* commit 'a85b789a':
  Fix 3381322: Update transition animation from lockscreen to home.
parents 599814f1 a85b789a

core/res/res/anim/lock_screen_behind_enter.xml

+25 −12
Original line number Original line Diff line number Diff line
@@ -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>
 
 No newline at end of file

core/res/res/anim/lock_screen_exit.xml

+23 −12
Original line number Original line Diff line number Diff line
@@ -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>
 
 No newline at end of file