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

Commit 85c607d0 authored by Brandon Keely's avatar Brandon Keely Committed by Android Git Automerger
Browse files

am 9dfce94a: am 86f23aaa: Merge "fragment transitions" into jb-dev 

* commit '9dfce94a':
  fragment transitions
parents 76f1d7ce 9dfce94a

core/res/res/animator/fragment_close_enter.xml

+4 −17
Original line number Diff line number Diff line
@@ -16,24 +16,11 @@ 
** limitations under the License. 

*/

-->

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

	android:zAdjustment="normal">

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

    <objectAnimator 

        android:interpolator="@interpolator/decelerate_quint"

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

        android:valueType="floatType"

        android:propertyName="scaleY"

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

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quint"

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

        android:valueType="floatType"

        android:propertyName="scaleX"

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

    <objectAnimator

        android:interpolator="@interpolator/decelerate_cubic"

        android:interpolator="@interpolator/decelerate_quad"

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

        android:valueType="floatType"

        android:propertyName="alpha"

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

        android:duration="300"/>

</set>
 
 No newline at end of file

core/res/res/animator/fragment_close_exit.xml

+10 −11
Original line number Diff line number Diff line
@@ -16,24 +16,23 @@ 
** limitations under the License. 

*/

-->

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

	android:zAdjustment="top">

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

    <objectAnimator 

        android:interpolator="@interpolator/decelerate_quint"

        android:valueFrom="1.0" android:valueTo="1.075"

        android:interpolator="@interpolator/decelerate_quad"

        android:valueFrom="1.0" android:valueTo="0.8"

        android:valueType="floatType"

        android:propertyName="scaleY"

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

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quint"

        android:valueFrom="1.0" android:valueTo="1.075"

        android:interpolator="@interpolator/decelerate_quad"

        android:valueFrom="1.0" android:valueTo="0.8"

        android:valueType="floatType"

        android:propertyName="scaleX"

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

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_cubic"

        android:interpolator="@interpolator/decelerate_quad"

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

        android:valueType="floatType"

        android:propertyName="alpha"

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

        android:duration="300"/>

</set>
 
 No newline at end of file

core/res/res/animator/fragment_open_enter.xml

+8 −8
Original line number Diff line number Diff line
@@ -18,21 +18,21 @@ 
-->

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

    <objectAnimator 

        android:interpolator="@interpolator/decelerate_quint"

        android:valueFrom="1.125" android:valueTo="1.0"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="0.8" android:valueTo="1.0"

        android:valueType="floatType"

        android:propertyName="scaleY"

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

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quint"

        android:valueFrom="1.125" android:valueTo="1.0"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="0.8" android:valueTo="1.0"

        android:valueType="floatType"

        android:propertyName="scaleX"

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

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_cubic"

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

        android:valueType="floatType"

        android:propertyName="alpha"

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

        android:duration="300"/>

</set>
 
 No newline at end of file

core/res/res/animator/fragment_open_exit.xml

+2 −14
Original line number Diff line number Diff line
@@ -17,22 +17,10 @@ 
*/

-->

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

    <objectAnimator

        android:interpolator="@interpolator/linear"

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

        android:valueType="floatType"

        android:propertyName="scaleY"

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

    <objectAnimator

        android:interpolator="@interpolator/linear"

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

        android:valueType="floatType"

        android:propertyName="scaleX"

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

    <objectAnimator 

        android:interpolator="@interpolator/decelerate_cubic"

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

        android:valueType="floatType"

        android:propertyName="alpha"

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

        android:duration="300"/>

</set>
 
 No newline at end of file