Stay in AlbumPage when dismissing a popup from AP

Bug: 7384972

Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index c8f296a..4c945a4 100644 (file)
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -454,14 +454,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             clearLoadingBit(BIT_LOADING_SYNC);
         }
         mActionModeHandler.pause();
-
-        // The camera app should always launch in capture mode when
-        // resumed, so make the next resume faster by closing the grid
-        // view now
-        if (mInCameraAndWantQuitOnPause) {
-            if (mActivity.getStateManager().getTopState() == this)
-                mActivity.getStateManager().finishState(this, false);
-        }
     }
 
     @Override

diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index 3293e40..d77279f 100644 (file)
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -160,6 +160,13 @@ public class StateManager {
         finishState(state, true);
     }
 
+    public void clearTasks() {
+        // Remove all the states that are on top of the bottom PhotoPage state
+        while (mStack.size() > 1) {
+            mStack.pop().activityState.onDestroy();
+        }
+    }
+
     void finishState(ActivityState state, boolean fireOnPause) {
         // The finish() request could be rejected (only happens under Monkey),
         // If it is rejected, we won't close the last page.