From a371154f08246e89c4cb4d5eaefd0b496ecc5632 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Wed, 20 Jun 2012 18:27:32 -0700
Subject: Make animations persist after completion.

Transition animations were set to fillAfter=false which caused them
to revert when they had completed. Normally this would not have
mattered as the final state was obscured by the new Activity. In
the case of the Phone app the Activities churn so much that the
original Activity was exposed.

Fixes bug 6691421.

Change-Id: I96b8a43d0a2cac9a34a14a309548c41451c65a57
---
 core/res/res/anim/activity_open_enter.xml | 4 ++--
 core/res/res/anim/activity_open_exit.xml  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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
-- 
cgit v1.1