Merge "Make animations persist after completion." into jb-dev
diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml
index c92f000..d553bdf 100644
--- a/core/res/res/anim/activity_open_enter.xml
+++ b/core/res/res/anim/activity_open_enter.xml
@@ -23,13 +23,13 @@
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:interpolator="@interpolator/decelerate_cubic"
android:fillEnabled="true"
- android:fillBefore="false" android:fillAfter="false"
+ android:fillBefore="false" android:fillAfter="true"
android:duration="300"/>
<scale android:fromXScale=".8" android:toXScale="1.0"
android:fromYScale=".8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:fillEnabled="true"
- android:fillBefore="false" android:fillAfter="false"
+ android:fillBefore="false" android:fillAfter="true"
android:duration="300"/>
</set>
\ No newline at end of file
diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml
index d7bfe82..2d105d1 100644
--- a/core/res/res/anim/activity_open_exit.xml
+++ b/core/res/res/anim/activity_open_exit.xml
@@ -17,9 +17,10 @@
*/
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="#ff000000" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="false" android:fillAfter="false"
+ android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quint"
android:duration="300"/>
</set>
\ No newline at end of file