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

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

Merge "Rough cut at new window animations."

parents 9ec4b7f2 bf78275b

core/res/res/anim/activity_close_enter.xml

+5 −4
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
-->



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

        android:interpolator="@anim/decelerate_interpolator">

    <!-- Do nothing. -->

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

            android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

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

        android:duration="@android:integer/config_shortAnimTime"/>

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/activity_close_exit.xml

+7 −2
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 


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

        android:interpolator="@anim/decelerate_interpolator">

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

        android:duration="@android:integer/config_shortAnimTime"/>

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

            android:fromYScale="1.0" android:toYScale="0.9"

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

            android:duration="@android:integer/config_mediumAnimTime" />

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

            android:interpolator="@anim/decelerate_interpolator"

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/activity_open_enter.xml

+7 −2
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 


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

        android:interpolator="@anim/decelerate_interpolator">

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

        android:duration="@android:integer/config_shortAnimTime"/>

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

            android:fromYScale="0.9" android:toYScale="1.0"

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

            android:duration="@android:integer/config_mediumAnimTime" />

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

            android:interpolator="@anim/accelerate_decelerate_interpolator"

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/activity_open_exit.xml

+5 −4
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
-->



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

        android:interpolator="@anim/decelerate_interpolator">

    <!-- Do nothing. -->

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

            android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

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

        android:duration="@android:integer/config_shortAnimTime"/>

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/task_close_enter.xml

+5 −10
Original line number Diff line number Diff line
@@ -18,14 +18,9 @@ 
-->



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

        android:interpolator="@anim/decelerate_interpolator">

    <!-- Do nothing. -->

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

            android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

    <!-- For now stay like the normal activity transition.

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

           android:fromYScale="2.0" android:toYScale="1.0"

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

           android:duration="@android:integer/config_shortAnimTime" />

    -->

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

        android:duration="@android:integer/config_shortAnimTime"/>

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>