Skip to content

Commit 255cb77

Browse files
Craig MautnerAndroid (Google) Code Review
authored andcommitted
Merge "Make animations persist after completion." into jb-dev
2 parents 5070a7f + a371154 commit 255cb77

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

core/res/res/anim/activity_open_enter.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
2424
android:interpolator="@interpolator/decelerate_cubic"
2525
android:fillEnabled="true"
26-
android:fillBefore="false" android:fillAfter="false"
26+
android:fillBefore="false" android:fillAfter="true"
2727
android:duration="300"/>
2828
<scale android:fromXScale=".8" android:toXScale="1.0"
2929
android:fromYScale=".8" android:toYScale="1.0"
3030
android:pivotX="50%p" android:pivotY="50%p"
3131
android:interpolator="@interpolator/decelerate_cubic"
3232
android:fillEnabled="true"
33-
android:fillBefore="false" android:fillAfter="false"
33+
android:fillBefore="false" android:fillAfter="true"
3434
android:duration="300"/>
3535
</set>

core/res/res/anim/activity_open_exit.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
*/
1818
-->
1919

20-
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
20+
<set xmlns:android="http://schemas.android.com/apk/res/android"
21+
android:background="#ff000000" android:zAdjustment="normal">
2122
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
22-
android:fillEnabled="true" android:fillBefore="false" android:fillAfter="false"
23+
android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"
2324
android:interpolator="@interpolator/decelerate_quint"
2425
android:duration="300"/>
2526
</set>

0 commit comments

Comments
 (0)