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

Commit 6e1cedc9 authored by Brandon Keely's avatar Brandon Keely Committed by Android Git Automerger
Browse files

am af1c1b3b: Merge "softening app-to-home and task-to-task transitions" into jb-dev 

* commit 'af1c1b3b':
  softening app-to-home and task-to-task transitions
parents dd684eb3 af1c1b3b

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

+11 −12
Original line number Diff line number Diff line
@@ -23,21 +23,20 @@ 
    <alpha android:fromAlpha="0" android:toAlpha="1.0"

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350"/>

            android:startOffset="300"

            android:duration="400"/>



    <translate android:fromXDelta="-140%" android:toXDelta="0"

    <translate android:fromXDelta="-120%" android:toXDelta="0"

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="300"

            android:duration="400" />



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

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

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

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

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

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

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350" />



            android:startOffset="300"

            android:duration="400" />

</set>
 
 No newline at end of file

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

+11 −11
Original line number Diff line number Diff line
@@ -19,25 +19,25 @@ 


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

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



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

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="350"/>

            android:duration="300"/>



    <translate android:fromXDelta="0" android:toXDelta="140%"

    <translate android:fromXDelta="0" android:toXDelta="120%"

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

            android:interpolator="@interpolator/decelerate_quad"

            android:duration="350"/>

            android:interpolator="@interpolator/accelerate_cubic"

            android:duration="300"/>



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

            android:fromYScale="1.0" android:toYScale="0.6"

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

            android:fromYScale="1.0" android:toYScale="0.5"

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

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="350" />

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="300" />



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

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="500" />

            android:duration="700" />

</set>
 
 No newline at end of file

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

+11 −12
Original line number Diff line number Diff line
@@ -23,21 +23,20 @@ 
    <alpha android:fromAlpha="0" android:toAlpha="1.0"

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350"/>

            android:startOffset="300"

            android:duration="400"/>



    <translate android:fromXDelta="140%" android:toXDelta="0"

    <translate android:fromXDelta="120%" android:toXDelta="0"

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="300"

            android:duration="400" />



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

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

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

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

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

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

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350" />



            android:startOffset="300"

            android:duration="400" />

</set>
 
 No newline at end of file

core/res/res/anim-land/task_open_exit.xml

+11 −11
Original line number Diff line number Diff line
@@ -19,25 +19,25 @@ 


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

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



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

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="350"/>

            android:duration="300"/>



    <translate android:fromXDelta="0" android:toXDelta="-140%"

    <translate android:fromXDelta="0" android:toXDelta="-120%"

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

            android:interpolator="@interpolator/decelerate_quad"

            android:duration="350"/>

            android:interpolator="@interpolator/accelerate_cubic"

            android:duration="300"/>



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

            android:fromYScale="1.0" android:toYScale="0.6"

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

            android:fromYScale="1.0" android:toYScale="0.5"

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

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="350" />

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="300" />



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

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

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="500" />

            android:duration="700" />

</set>
 
 No newline at end of file

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

+11 −12
Original line number Diff line number Diff line
@@ -23,21 +23,20 @@ 
    <alpha android:fromAlpha="0" android:toAlpha="1.0"

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

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350"/>

            android:startOffset="300"

            android:duration="400"/>



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

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

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

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="300"

            android:duration="400" />



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

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

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

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

            android:fromYScale=".5" 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:startOffset="150"

            android:duration="350" />



            android:startOffset="300"

            android:duration="400" />

</set>
 
 No newline at end of file