diff options
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/StateManager.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 29b657339..addee0ed7 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -436,7 +436,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster // view now if (mInCameraApp) { if (mActivity.getStateManager().getTopState() == this) - mActivity.getStateManager().finishState(this); + mActivity.getStateManager().finishState(this, false); } } diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java index c192a88a3..e22fdf2c7 100644 --- a/src/com/android/gallery3d/app/StateManager.java +++ b/src/com/android/gallery3d/app/StateManager.java @@ -152,6 +152,10 @@ public class StateManager { } void finishState(ActivityState state) { + finishState(state, true); + } + + 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. if (mStack.size() == 1) { @@ -182,7 +186,7 @@ public class StateManager { // Remove the top state. mStack.pop(); state.mIsFinishing = true; - if (mIsResumed) state.onPause(); + if (mIsResumed && fireOnPause) state.onPause(); mActivity.getGLRoot().setContentPane(null); state.onDestroy(); |