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

Commit 44e5c9a0 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes I037517d9,Ic603b271,I47fe530f into sc-qpr1-dev 

* changes:
  Update task transition animations
  Show color layer in task animations when requested
  Add color layer to TaskDisplayArea for animations
parents 2b879d36 49fa1851

core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml

+6 −42
Original line number Diff line number Diff line
@@ -18,19 +18,10 @@ 
-->

<!-- This should be kept in sync with task_open_enter.xml -->

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

     android:hasRoundedCorners="true"

     android:shareInterpolator="false"

     android:zAdjustment="top">



    <alpha

        android:fromAlpha="1"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="67"

        android:duration="217"/>

     android:zAdjustment="top"

     android:hasRoundedCorners="true"

     android:background="@color/overview_background">



    <translate

        android:fromXDelta="-105%"
@@ -38,36 +29,9 @@ 
        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/aggressive_ease"

        android:startOffset="50"

        android:duration="383"/>



    <scale

        android:fromXScale="1.0526"

        android:toXScale="1"

        android:fromYScale="1.0526"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="283"/>



    <scale

        android:fromXScale="0.95"

        android:toXScale="1"

        android:fromYScale="0.95"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:startOffset="283"

        android:duration="317"/>

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="500"/>



    <!-- To keep the thumbnail around longer and fade out the thumbnail -->

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

core/res/res/anim-ldrtl/task_close_enter.xml

+7 −44
Original line number Diff line number Diff line
@@ -17,17 +17,7 @@ 
     android:shareInterpolator="false"

     android:zAdjustment="top"

     android:hasRoundedCorners="true"

    android:showWallpaper="true">



    <alpha

        android:fromAlpha="1"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="67"

        android:duration="217"/>

     android:background="@color/overview_background">



    <translate

        android:fromXDelta="105%"
@@ -35,34 +25,7 @@ 
        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/aggressive_ease"

        android:startOffset="50"

        android:duration="383"/>



    <scale

        android:fromXScale="1.0526"

        android:toXScale="1"

        android:fromYScale="1.0526"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="283"/>



    <scale

        android:fromXScale="0.95"

        android:toXScale="1"

        android:fromYScale="0.95"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:startOffset="283"

        android:duration="317"/>

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="500"/>

</set>
 
 No newline at end of file

core/res/res/anim-ldrtl/task_close_exit.xml

+6 −29
Original line number Diff line number Diff line
@@ -17,17 +17,7 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

     android:shareInterpolator="false"

     android:hasRoundedCorners="true"

    android:showWallpaper="true">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="67"

        android:duration="283"/>

     android:background="@color/overview_background">



    <translate

        android:fromXDelta="0"
@@ -35,22 +25,9 @@ 
        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/aggressive_ease"

        android:startOffset="50"

        android:duration="383"/>



    <scale

        android:fromXScale="1.0"

        android:toXScale="0.95"

        android:fromYScale="1.0"

        android:toYScale="0.95"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:pivotX="50%"

        android:pivotY="50%"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="283"/>

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="500"/>



    <!-- This is needed to keep the animation running while task_open_enter completes -->

    <alpha

core/res/res/anim-ldrtl/task_open_enter.xml

+8 −45
Original line number Diff line number Diff line
@@ -19,17 +19,7 @@ 
     android:shareInterpolator="false"

     android:zAdjustment="top"

     android:hasRoundedCorners="true"

    android:showWallpaper="true">



    <alpha

        android:fromAlpha="1"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="67"

        android:duration="217"/>

     android:background="@color/overview_background">



    <translate

        android:fromXDelta="-105%"
@@ -37,34 +27,7 @@ 
        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/aggressive_ease"

        android:startOffset="50"

        android:duration="383"/>



    <scale

        android:fromXScale="1.0526"

        android:toXScale="1"

        android:fromYScale="1.0526"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="283"/>



    <scale

        android:fromXScale="0.95"

        android:toXScale="1"

        android:fromYScale="0.95"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:startOffset="283"

        android:duration="317"/>

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="500"/>

</set>

core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml

+8 −45
Original line number Diff line number Diff line
@@ -19,17 +19,7 @@ 
     android:shareInterpolator="false"

     android:zAdjustment="top"

     android:hasRoundedCorners="true"

    android:showWallpaper="true">



    <alpha

        android:fromAlpha="1"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="67"

        android:duration="217"/>

     android:background="@color/overview_background">



    <translate

        android:fromXDelta="-105%"
@@ -37,36 +27,9 @@ 
        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/aggressive_ease"

        android:startOffset="50"

        android:duration="383"/>



    <scale

        android:fromXScale="1.0526"

        android:toXScale="1"

        android:fromYScale="1.0526"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="283"/>



    <scale

        android:fromXScale="0.95"

        android:toXScale="1"

        android:fromYScale="0.95"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:startOffset="283"

        android:duration="317"/>

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="500"/>



    <!-- To keep the transition around longer for the thumbnail, should be kept in sync with

         cross_profile_apps_thumbmail.xml -->