From e3239b8d24dfba2b34a3ffbe1fab300ae331f62b Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Mon, 8 Aug 2011 16:26:47 -0700
Subject: [PATCH] Fix fill behavior in an old AnimationSet demo.

FillEnabled/FillBefore/FillAfter have somewhat non-intuitive behavior.
The demo didn't work at all as intended, so I changed the animation resource
to reflect the actual behavior desired (delay starting the child animations
in the inner AnimationSet and avoid having those animations set the transform
before they start)

Change-Id: I135842091902ba243851dad0104f86e1b8605053
---
 samples/ApiDemos/res/anim/hyperspace_out.xml | 69 +++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/samples/ApiDemos/res/anim/hyperspace_out.xml b/samples/ApiDemos/res/anim/hyperspace_out.xml
index 83fef3347..542fa05bf 100644
--- a/samples/ApiDemos/res/anim/hyperspace_out.xml
+++ b/samples/ApiDemos/res/anim/hyperspace_out.xml
@@ -16,39 +16,46 @@
 
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
 
-	<scale 
-		android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-		android:fromXScale="1.0" 
-		android:toXScale="1.4" 
-		android:fromYScale="1.0" 
-		android:toYScale="0.6" 
-		android:pivotX="50%"
-		android:pivotY="50%"
-		android:fillAfter="false"
-		android:duration="700" />
+    <scale 
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:fromXScale="1.0" 
+        android:toXScale="1.4" 
+        android:fromYScale="1.0" 
+        android:toYScale="0.6" 
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fillEnabled="true"
+        android:fillAfter="false"
+        android:duration="700" />
 
 
-	<set 
-		android:interpolator="@android:anim/accelerate_interpolator"
-                android:startOffset="700">
-		
-		<scale
-			android:fromXScale="1.4" 
-			android:toXScale="0.0"
-		        android:fromYScale="0.6"
-	 		android:toYScale="0.0" 
-	 		android:pivotX="50%" 
-	 		android:pivotY="50%" 
-	 		android:duration="400" />
- 		
-		<rotate 
-			android:fromDegrees="0" 
-			android:toDegrees="-45"
-	 		android:toYScale="0.0" 
-	 		android:pivotX="50%" 
-	 		android:pivotY="50%"
-	 		android:duration="400" />
-	</set>
+    <set android:interpolator="@android:anim/accelerate_interpolator">
+        
+        <scale
+            android:fromXScale="1.4" 
+            android:toXScale="0.0"
+            android:fromYScale="0.6"
+            android:toYScale="0.0"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fillEnabled="true"
+            android:fillBefore="false"
+            android:fillAfter="true"
+            android:startOffset="700"
+            android:duration="400" />
+         
+        <rotate 
+            android:fromDegrees="0" 
+            android:toDegrees="-45"
+            android:toYScale="0.0"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fillEnabled="true"
+            android:fillBefore="false"
+            android:fillAfter="true"
+            android:startOffset="700"
+            android:duration="400" />
+    </set>
 
 </set>