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

Commit 20f9fec0 authored by Brandon Keely's avatar Brandon Keely Committed by Android (Google) Code Review
Browse files

Merge "Massaging system transitions."

parents 3db6af92 0fe197ee

core/res/res/anim/activity_close_enter.xml

+5 −5
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

		android:zAdjustment="normal"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="0.975" 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:interpolator="@anim/decelerate_cubic_interpolator"

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

</set>
 
 No newline at end of file

core/res/res/anim/activity_close_exit.xml

+5 −6
Original line number Diff line number Diff line
@@ -20,13 +20,12 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

		android:zAdjustment="top"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="1.0" android:toYScale="1.075"

            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.0"

            android:interpolator="@anim/decelerate_quint_interpolator"

            android:interpolator="@anim/decelerate_cubic_interpolator"

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



</set>
 
 No newline at end of file

core/res/res/anim/activity_open_enter.xml

+5 −6
Original line number Diff line number Diff line
@@ -20,13 +20,12 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

		android:zAdjustment="top"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="1.125" 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="0.0" android:toAlpha="1.0"

            android:interpolator="@anim/decelerate_quint_interpolator"

            android:interpolator="@anim/decelerate_cubic_interpolator"

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



</set>
 
 No newline at end of file

core/res/res/anim/activity_open_exit.xml

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

		android:zAdjustment="normal"

        android:shareInterpolator="false">

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

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

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

            android:fromYScale="1.0" android:toYScale="0.975"

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

            android:interpolator="@anim/decelerate_quint_interpolator"

            android:interpolator="@anim/linear_interpolator"

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

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

            android:interpolator="@anim/decelerate_quint_interpolator"

            android:interpolator="@anim/decelerate_cubic_interpolator"

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



</set>
 
 No newline at end of file

core/res/res/anim/fragment_close_enter.xml

+4 −9
Original line number Diff line number Diff line
@@ -18,27 +18,22 @@ 
-->

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

	android:zAdjustment="normal">



    <objectAnimator

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom="0.98"

        android:valueTo="1.0"

        android:valueFrom="0.975" android:valueTo="1.0"

        android:valueType="floatType"

        android:propertyName="scaleY"

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

    <objectAnimator

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom="0.98"

        android:valueTo="1.0"

        android:valueFrom="0.975" android:valueTo="1.0"

        android:valueType="floatType"

        android:propertyName="scaleX"

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

    <objectAnimator

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="0.0"

        android:valueTo="1.0"

        android:valueFrom="0.0" android:valueTo="1.0"

        android:valueType="floatType"

        android:propertyName="alpha"

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



</set>
 
 No newline at end of file