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

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

Merge "New animations from lbk."

parents 6804433b 9a372f53

core/res/res/anim/activity_close_enter.xml

+9 −3
Original line number Diff line number Diff line
@@ -18,8 +18,14 @@ 
-->



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

		android:zAdjustment="normal"

        android:shareInterpolator="false">

    <!-- Do nothing. -->

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

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

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

            android:fromYScale="0.98" android:toYScale="1.0"

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

</set>

core/res/res/anim/activity_close_exit.xml

+8 −6
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ 
-->



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

		android:zAdjustment="top"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="1.0" android:toYScale="1.04"

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

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

            android:interpolator="@anim/decelerate_cubic_interpolator"

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

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

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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



</set>

core/res/res/anim/activity_open_enter.xml

+8 −6
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ 
-->



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

		android:zAdjustment="top"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="1.04" android:toYScale="1.0"

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

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

            android:interpolator="@anim/decelerate_cubic_interpolator"

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

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

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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



</set>

core/res/res/anim/activity_open_exit.xml

+10 −3
Original line number Diff line number Diff line
@@ -18,8 +18,15 @@ 
-->



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

		android:zAdjustment="normal"

        android:shareInterpolator="false">

    <!-- Do nothing. -->

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

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

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

            android:fromYScale="1.0" android:toYScale="0.98"

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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



</set>

core/res/res/anim/dialog_enter.xml

+5 −3
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ 
-->



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

        android:interpolator="@anim/decelerate_interpolator">

		android:shareInterpolator="false" >

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

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

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

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

			android:interpolator="@anim/decelerate_quint_interpolator"

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

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

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

			android:interpolator="@anim/decelerate_cubic_interpolator"

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

</set>