issue 694 - fix out-animation failure to execute

Update to rev 1016
getodk · Oct 9, 2012 · a0c6529 · a0c6529
1 parent 0ad0c4f
commit a0c6529
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -10,7 +10,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.odk.collect.android"
-    android:versionCode="1015"
+    android:versionCode="1016"
     android:versionName="1.2.1" >
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/src/org/odk/collect/android/activities/FormEntryActivity.java b/src/org/odk/collect/android/activities/FormEntryActivity.java
@@ -1017,9 +1017,10 @@ public void showView(View next, AnimationType from) {
         mRelativeLayout.addView(mCurrentView, lp);
 
         if (mStaleView != null) {
-        	mRelativeLayout.removeView(mStaleView);
         	// start OutAnimation for transition...
             mStaleView.startAnimation(mOutAnimation);
+            // and remove the old view (MUST occur after start of animation!!!)
+        	mRelativeLayout.removeView(mStaleView);
         }
         // start InAnimation for transition...
         mCurrentView.startAnimation(mInAnimation);