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

Commit 9ebb08d2 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update default activity animations 

For T we will be using the cross fade animation proposed in go/t-activity-transitions (https://direct.googleplex.com/#/spec/241720001&247800001) - this is what we are implemented here

This animation only works properly if shell transitions are enabled as it uses the edgeExtension effect currently only implemented in shell

Test: atest FlickerTests
Bug: 202844659
Change-Id: Ibb863815b8a25f8d6ad0201203f7d550948f7158
parent 108a2ad1

core/res/res/anim/activity_close_enter.xml

+29 −8
Original line number Diff line number Diff line
@@ -19,16 +19,37 @@ 


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

    android:shareInterpolator="false">

    <scale

        android:fromXScale="1.1"

        android:toXScale="1"

        android:fromYScale="1.1"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="0"

        android:duration="450" />



    <translate

        android:fromXDelta="-10%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />



    <extend

        android:fromExtendLeft="0"

        android:fromExtendTop="0"

        android:fromExtendRight="10%"

        android:fromExtendBottom="0"

        android:toExtendLeft="0"

        android:toExtendTop="0"

        android:toExtendRight="10%"

        android:toExtendBottom="0"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

        android:startOffset="0"

        android:duration="450" />

</set>
 
 No newline at end of file

core/res/res/anim/activity_close_exit.xml

+24 −13
Original line number Diff line number Diff line
@@ -18,27 +18,38 @@ 
-->



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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    android:shareInterpolator="false">



    <alpha

        android:fromAlpha="1"

        android:fromAlpha="1.0"

        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:startOffset="35"

        android:duration="83" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="10%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

        android:startOffset="0"

        android:duration="450" />



    <extend

        android:fromExtendLeft="10%"

        android:fromExtendTop="0"

        android:fromExtendRight="0"

        android:fromExtendBottom="0"

        android:toExtendLeft="10%"

        android:toExtendTop="0"

        android:toExtendRight="0"

        android:toExtendBottom="0"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />

</set>

core/res/res/anim/activity_open_enter.xml

+20 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


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

    android:shareInterpolator="false">



    <alpha

        android:fromAlpha="0"

        android:toAlpha="1.0"
@@ -26,17 +27,27 @@ 
        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:duration="83" />



    <translate

        android:fromXDelta="10%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

        android:duration="450" />



    <extend

        android:fromExtendLeft="10%"

        android:fromExtendTop="0"

        android:fromExtendRight="0"

        android:fromExtendBottom="0"

        android:toExtendLeft="10%"

        android:toExtendTop="0"

        android:toExtendRight="0"

        android:toExtendBottom="0"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />

</set>

core/res/res/anim/activity_open_exit.xml

+23 −14
Original line number Diff line number Diff line
@@ -19,27 +19,36 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">



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

    <alpha

        android:fromAlpha="1"

        android:toAlpha="0.4"

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="83"

        android:duration="167"/>

        android:interpolator="@interpolator/standard_accelerate"

        android:startOffset="0"

        android:duration="450" />



    <scale

        android:fromXScale="1"

        android:toXScale="1.05"

        android:fromYScale="1"

        android:toYScale="1.05"

        android:pivotX="50%"

        android:pivotY="50%"

    <translate

        android:fromXDelta="0"

        android:toXDelta="-10%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

        android:startOffset="0"

        android:duration="450" />



    <extend

        android:fromExtendLeft="0"

        android:fromExtendTop="0"

        android:fromExtendRight="10%"

        android:fromExtendBottom="0"

        android:toExtendLeft="0"

        android:toExtendTop="0"

        android:toExtendRight="10%"

        android:toExtendBottom="0"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />

</set>
 
 No newline at end of file