summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/AlbumPage.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-10-23 16:12:27 -0700
committerDoris Liu <tianliu@google.com>2012-10-23 17:23:46 -0700
commit5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d (patch)
tree0c67f0664a43c1c183bec367a12c54adc4a9c0ac /src/com/android/gallery3d/app/AlbumPage.java
parenta41224997ef9be9c0d04534f7b6b9c6b933bfe05 (diff)
downloadandroid_packages_apps_Gallery2-5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d.tar.gz
android_packages_apps_Gallery2-5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d.tar.bz2
android_packages_apps_Gallery2-5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d.zip
Stay in AlbumPage when dismissing a popup from AP
Bug: 7384972 Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index c8f296afc..4c945a45b 100644
--- 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