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

Commit 10ae84a9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "New activity transitions" into qt-dev

parents ef2e036f b989d0ac

core/res/res/anim/activity_close_enter.xml

+12 −11
Original line number Diff line number Diff line
@@ -19,15 +19,16 @@ 


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

    android:shareInterpolator="false">

    <translate

        android:fromYDelta="-2%"

        android:toYDelta="0"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="425"/>

    <alpha

        android:fromAlpha="0.9"

        android:toAlpha="1.0"

        android:interpolator="@interpolator/activity_close_dim"

        android:startOffset="0"

        android:duration="425"/>

    <scale

        android:fromXScale="1.1"

        android:toXScale="1"

        android:fromYScale="1.1"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file

core/res/res/anim/activity_close_exit.xml

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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <translate

        android:fromYDelta="0"

        android:toYDelta="4.1%"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="425"/>

    <cliprect

        android:fromLeft="0%"

        android:fromTop="0%"

        android:fromRight="100%"

        android:fromBottom="100%"

        android:toLeft="0%"

        android:toTop="95.9%"

        android:toRight="100%"

        android:toBottom="100%"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="425"/>

    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:interpolator="@interpolator/fast_out_linear_in"

        android:duration="425"/>

        android:fromAlpha="1"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="33"

        android:duration="50"/>

    <scale

        android:fromXScale="1"

        android:toXScale="0.9"

        android:fromYScale="1"

        android:toYScale="0.9"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>

core/res/res/anim/activity_open_enter.xml

+20 −15
Original line number Diff line number Diff line
@@ -18,20 +18,25 @@ 


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

    android:shareInterpolator="false">

    <translate

        android:fromYDelta="4.1%"

        android:toYDelta="0"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="425"/>

    <cliprect

        android:fromLeft="0%"

        android:fromTop="95.9%"

        android:fromRight="100%"

        android:fromBottom="100%"

        android:toLeft="0%"

        android:toTop="0%"

        android:toRight="100%"

        android:toBottom="100%"

    <alpha

        android:fromAlpha="0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="50"

        android:duration="50"/>

    <scale

        android:fromXScale="0.85"

        android:toXScale="1"

        android:fromYScale="0.85"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="425"/>

        android:duration="400"/>

</set>

core/res/res/anim/activity_open_exit.xml

+22 −8
Original line number Diff line number Diff line
@@ -18,14 +18,28 @@ 


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

    android:shareInterpolator="false">

    <translate

        android:fromYDelta="0"

        android:toYDelta="-2%"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="425"/>



    <!-- Fade out, over a black surface, which simulates a black scrim -->

    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.9"

        android:fromAlpha="1"

        android:toAlpha="0.4"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:duration="117"/>

        android:startOffset="83"

        android:duration="167"/>



    <scale

        android:fromXScale="1"

        android:toXScale="1.05"

        android:fromYScale="1"

        android:toYScale="1.05"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file