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

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

Merge "Tweak fragment animations to be more consistent with window anims."

parents 91a08cfc 0ff229f2

core/res/res/anim/fragment_close_enter.xml

+1 −8
Original line number Diff line number Diff line
@@ -18,17 +18,10 @@ 
-->

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

    <objectAnimator

        android:interpolator="@anim/decelerate_interpolator"

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="0"

        android:valueTo="1"

        android:valueType="floatType"

        android:propertyName="alpha"

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

    <objectAnimator

        android:interpolator="@anim/decelerate_interpolator"

        android:valueFrom="-100"

        android:valueTo="0"

        android:valueType="floatType"

        android:propertyName="translationX"

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

</set>
 
 No newline at end of file

core/res/res/anim/fragment_close_exit.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ 
-->

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

    <objectAnimator

        android:interpolator="@anim/accelerate_interpolator"

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="1"

        android:valueTo="0"

        android:valueType="floatType"

        android:propertyName="alpha"

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

    <objectAnimator

        android:interpolator="@anim/accelerate_interpolator"

        android:valueFrom="0"

        android:valueTo="100"

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom="1"

        android:valueTo=".8"

        android:valueType="floatType"

        android:propertyName="translationX"

        android:propertyName="scaleY"

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

</set>
 
 No newline at end of file

core/res/res/anim/fragment_next_enter.xml

+4 −2
Original line number Diff line number Diff line
@@ -18,15 +18,17 @@ 
-->

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

    <objectAnimator

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="0"

        android:valueTo="1"

        android:valueType="floatType"

        android:propertyName="alpha"

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

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

    <objectAnimator

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom="50"

        android:valueTo="0"

        android:valueType="floatType"

        android:propertyName="translationY"

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

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

</set>
 
 No newline at end of file

core/res/res/anim/fragment_next_exit.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ 
-->

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

    <objectAnimator

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="1"

        android:valueTo="0"

        android:valueType="floatType"

        android:propertyName="alpha"

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

    <objectAnimator

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom="0"

        android:valueTo="-50"

        android:valueType="floatType"

core/res/res/anim/fragment_open_enter.xml

+5 −3
Original line number Diff line number Diff line
@@ -18,15 +18,17 @@ 
-->

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

    <objectAnimator

        android:interpolator="@anim/decelerate_cubic_interpolator"

        android:valueFrom="0"

        android:valueTo="1"

        android:valueType="floatType"

        android:propertyName="alpha"

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

    <objectAnimator

        android:valueFrom="100"

        android:valueTo="0"

        android:interpolator="@anim/decelerate_quint_interpolator"

        android:valueFrom=".8"

        android:valueTo="1"

        android:valueType="floatType"

        android:propertyName="translationX"

        android:propertyName="scaleY"

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

</set>
 
 No newline at end of file