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

Commit d42fbba0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #3414684: task_intra_wallpaper transitions have some inconsistency"

parents b3703a76 da048264

core/res/res/anim/wallpaper_intra_close_enter.xml

+6 −6
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ 


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

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

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

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

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

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

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

            android:fillEnabled="true" android:fillBefore="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="200"

            android:startOffset="160"

            android:duration="300" />

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

            android:fillEnabled="true" android:fillBefore="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="200"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="160"

            android:duration="300"/>

</set>
 
 No newline at end of file

core/res/res/anim/wallpaper_intra_close_exit.xml

+6 −6
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 


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

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

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

            android:fromYScale="1.0" android:toYScale="0.9"

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

            android:fromYScale="1.0" android:toYScale="0.0"

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

            android:fillEnabled="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:interpolator="@interpolator/linear"

            android:duration="300" />

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

        	android:fillEnabled="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="150"/>

            android:duration="120"/>

</set>
 
 No newline at end of file

core/res/res/anim/wallpaper_intra_open_enter.xml

+7 −5
Original line number Diff line number Diff line
@@ -19,14 +19,16 @@ 


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

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

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

            android:fromYScale="0.95" android:toYScale="1.0"

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

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

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

            android:fillEnabled="true" android:fillBefore="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="200"

            android:startOffset="160"

            android:duration="300" />

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

            android:fillEnabled="true" android:fillBefore="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="200"

            android:startOffset="160"

            android:duration="300"/>

</set>
 
 No newline at end of file

core/res/res/anim/wallpaper_intra_open_exit.xml

+4 −2
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ 
    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="0.0"

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

            android:fillEnabled="true" android:fillAfter="true"

            android:interpolator="@interpolator/linear"

            android:duration="300" />

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

        	android:fillEnabled="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="160"/>

            android:duration="120"/>

</set>
 
 No newline at end of file