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

Commit 367c6c7b authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Wallpaper transition changed to fade instead of translate/scale/fade."

parents 091511b4 21b4b04f

core/res/res/anim/wallpaper_intra_close_enter.xml

+2 −8
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

    <scale android:fromXScale="2.0" android:toXScale="1.0"

           android:fromYScale="2.0" android:toYScale="1.0"

           android:pivotX="100%p" android:pivotY="50%p"

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

	<translate android:fromXDelta="-150%p" android:toXDelta="0%p"

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

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

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

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

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

</set>

core/res/res/anim/wallpaper_intra_close_exit.xml

+3 −9
Original line number Diff line number Diff line
@@ -18,13 +18,7 @@ 
-->



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

        android:interpolator="@anim/accelerate_interpolator">

    <scale android:fromXScale="1.0" android:toXScale=".5"

           android:fromYScale="1.0" android:toYScale=".5"

           android:pivotX="100%p" android:pivotY="50%p"

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

	<translate android:fromXDelta="0%p" android:toXDelta="100%p"

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

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

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

        android:interpolator="@anim/decelerate_interpolator">

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

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

</set>

core/res/res/anim/wallpaper_intra_open_enter.xml

+2 −8
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 


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

        android:interpolator="@anim/decelerate_interpolator">

    <scale android:fromXScale=".5" android:toXScale="1.0"

           android:fromYScale=".5" android:toYScale="1.0"

           android:pivotX="100%p" android:pivotY="50%p"

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

    <translate android:fromXDelta="100%p" android:toXDelta="0"

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

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

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

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

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

</set>

core/res/res/anim/wallpaper_intra_open_exit.xml

+3 −9
Original line number Diff line number Diff line
@@ -18,14 +18,8 @@ 
-->



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

        android:interpolator="@anim/accelerate_interpolator"

        android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

    <scale android:fromXScale="1.0" android:toXScale="2.0"

           android:fromYScale="1.0" android:toYScale="2.0"

           android:pivotX="100%p" android:pivotY="50%p"

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

    <translate android:fromXDelta="0" android:toXDelta="-150%p"

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

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

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

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

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

</set>