Skip to content

Commit 963daf2

Browse files
committed
fragment transitions
Change-Id: I8a3078b32b9543dd1b3a79231c3199f842f3cfd1
1 parent b86bc10 commit 963daf2

File tree

4 files changed

+24
-50
lines changed

4 files changed

+24
-50
lines changed

core/res/res/animator/fragment_close_enter.xml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,11 @@
1616
** limitations under the License.
1717
*/
1818
-->
19-
<set xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:zAdjustment="normal">
21-
<objectAnimator
22-
android:interpolator="@interpolator/decelerate_quint"
23-
android:valueFrom="0.975" android:valueTo="1.0"
24-
android:valueType="floatType"
25-
android:propertyName="scaleY"
26-
android:duration="@android:integer/config_activityDefaultDur"/>
27-
<objectAnimator
28-
android:interpolator="@interpolator/decelerate_quint"
29-
android:valueFrom="0.975" android:valueTo="1.0"
30-
android:valueType="floatType"
31-
android:propertyName="scaleX"
32-
android:duration="@android:integer/config_activityDefaultDur"/>
33-
<objectAnimator
34-
android:interpolator="@interpolator/decelerate_cubic"
19+
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
20+
<objectAnimator
21+
android:interpolator="@interpolator/decelerate_quad"
3522
android:valueFrom="0.0" android:valueTo="1.0"
3623
android:valueType="floatType"
3724
android:propertyName="alpha"
38-
android:duration="@android:integer/config_activityDefaultDur"/>
25+
android:duration="300"/>
3926
</set>

core/res/res/animator/fragment_close_exit.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,23 @@
1616
** limitations under the License.
1717
*/
1818
-->
19-
<set xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:zAdjustment="top">
21-
<objectAnimator
22-
android:interpolator="@interpolator/decelerate_quint"
23-
android:valueFrom="1.0" android:valueTo="1.075"
19+
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="top">
20+
<objectAnimator
21+
android:interpolator="@interpolator/decelerate_quad"
22+
android:valueFrom="1.0" android:valueTo="0.8"
2423
android:valueType="floatType"
2524
android:propertyName="scaleY"
26-
android:duration="@android:integer/config_activityDefaultDur"/>
25+
android:duration="300"/>
2726
<objectAnimator
28-
android:interpolator="@interpolator/decelerate_quint"
29-
android:valueFrom="1.0" android:valueTo="1.075"
27+
android:interpolator="@interpolator/decelerate_quad"
28+
android:valueFrom="1.0" android:valueTo="0.8"
3029
android:valueType="floatType"
3130
android:propertyName="scaleX"
32-
android:duration="@android:integer/config_activityDefaultDur"/>
31+
android:duration="300"/>
3332
<objectAnimator
34-
android:interpolator="@interpolator/decelerate_cubic"
33+
android:interpolator="@interpolator/decelerate_quad"
3534
android:valueFrom="1.0" android:valueTo="0.0"
3635
android:valueType="floatType"
3736
android:propertyName="alpha"
38-
android:duration="@android:integer/config_activityDefaultDur"/>
37+
android:duration="300"/>
3938
</set>

core/res/res/animator/fragment_open_enter.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
*/
1818
-->
1919
<set xmlns:android="http://schemas.android.com/apk/res/android">
20-
<objectAnimator
21-
android:interpolator="@interpolator/decelerate_quint"
22-
android:valueFrom="1.125" android:valueTo="1.0"
20+
<objectAnimator
21+
android:interpolator="@interpolator/decelerate_cubic"
22+
android:valueFrom="0.8" android:valueTo="1.0"
2323
android:valueType="floatType"
2424
android:propertyName="scaleY"
25-
android:duration="@android:integer/config_activityDefaultDur"/>
25+
android:duration="300"/>
2626
<objectAnimator
27-
android:interpolator="@interpolator/decelerate_quint"
28-
android:valueFrom="1.125" android:valueTo="1.0"
27+
android:interpolator="@interpolator/decelerate_cubic"
28+
android:valueFrom="0.8" android:valueTo="1.0"
2929
android:valueType="floatType"
3030
android:propertyName="scaleX"
31-
android:duration="@android:integer/config_activityDefaultDur"/>
31+
android:duration="300"/>
3232
<objectAnimator
3333
android:interpolator="@interpolator/decelerate_cubic"
3434
android:valueFrom="0.0" android:valueTo="1.0"
3535
android:valueType="floatType"
3636
android:propertyName="alpha"
37-
android:duration="@android:integer/config_activityDefaultDur"/>
37+
android:duration="300"/>
3838
</set>

core/res/res/animator/fragment_open_exit.xml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,10 @@
1717
*/
1818
-->
1919
<set xmlns:android="http://schemas.android.com/apk/res/android">
20-
<objectAnimator
21-
android:interpolator="@interpolator/linear"
22-
android:valueFrom="1.0" android:valueTo="0.975"
23-
android:valueType="floatType"
24-
android:propertyName="scaleY"
25-
android:duration="@android:integer/config_activityDefaultDur"/>
26-
<objectAnimator
27-
android:interpolator="@interpolator/linear"
28-
android:valueFrom="1.0" android:valueTo="0.975"
29-
android:valueType="floatType"
30-
android:propertyName="scaleX"
31-
android:duration="@android:integer/config_activityDefaultDur"/>
32-
<objectAnimator
20+
<objectAnimator
3321
android:interpolator="@interpolator/decelerate_cubic"
3422
android:valueFrom="1.0" android:valueTo="0.0"
3523
android:valueType="floatType"
3624
android:propertyName="alpha"
37-
android:duration="@android:integer/config_activityDefaultDur"/>
25+
android:duration="300"/>
3826
</set>

0 commit comments

Comments
 (0)