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

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

Merge "[system transitions] + merge all transition work into new branch for... 

Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev
parents ceb997ba 7e3357a5

core/res/res/anim/activity_close_enter.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
-->



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

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

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

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

            android:duration="300"/>

            android:interpolator="@interpolator/linear_out_slow_in"

            android:duration="250"/>

</set>
 
 No newline at end of file

core/res/res/anim/activity_close_exit.xml

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

        android:shareInterpolator="false" android:zAdjustment="top">

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:interpolator="@interpolator/accelerate_quart"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:startOffset="100"

            android:duration="150"/>

    <translate android:fromYDelta="0%" android:toYDelta="5%"

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

            android:duration="300"/>

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

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

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

            android:interpolator="@interpolator/decelerate_cubic"

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

            android:duration="300"/>

            android:interpolator="@interpolator/accelerate_quint"

            android:duration="250"/>

</set>
 
 No newline at end of file

core/res/res/anim/activity_open_enter.xml

+6 −9
Original line number Diff line number Diff line
@@ -21,15 +21,12 @@ 
        android:shareInterpolator="false"

        android:zAdjustment="top">

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:interpolator="@interpolator/decelerate_quart"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:duration="300"/>

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

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

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:duration="300"/>

            android:duration="200"/>

    <translate android:fromYDelta="8%" android:toYDelta="0"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:duration="350"/>

</set>
 
 No newline at end of file

core/res/res/anim/activity_open_exit.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 


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

        android:background="#ff000000" android:zAdjustment="normal">

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

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

            android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:duration="300"/>

            android:interpolator="@interpolator/fast_out_slow_in"

            android:duration="217"/>

</set>
 
 No newline at end of file

core/res/res/anim/task_close_enter.xml

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



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

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">



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

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

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="300"

            android:duration="400"/>

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="600"

            android:duration="133"/>



    <translate android:fromYDelta="-120%" android:toYDelta="0"

    <translate android:fromYDelta="10%" android:toYDelta="0"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="300"

            android:duration="400" />

            android:duration="433" />



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

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

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

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

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

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

            android:interpolator="@interpolator/decelerate_quad"

            android:interpolator="@interpolator/fast_out_slow_in"

            android:startOffset="300"

            android:duration="400" />

            android:duration="433" />

</set>
 
 No newline at end of file