diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-18 20:50:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-18 20:50:20 -0700 |
| commit | 5530e2979762541936a2087df57a5fbaab8cc53a (patch) | |
| tree | e5733cc52591ead4f6470d404da3bb19c8dd7039 | |
| parent | 8c6181a363fad6f37bc780e3f4c109009a7646e5 (diff) | |
| parent | 3045c0c57f5d0850a181ced58df657725afa96fb (diff) | |
| download | android_packages_apps_Snap-5530e2979762541936a2087df57a5fbaab8cc53a.tar.gz android_packages_apps_Snap-5530e2979762541936a2087df57a5fbaab8cc53a.tar.bz2 android_packages_apps_Snap-5530e2979762541936a2087df57a5fbaab8cc53a.zip | |
Merge "Fix Gallery crash" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index f1e149771..6e859a978 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -104,6 +104,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster private Future<Integer> mSyncTask = null; private boolean mLaunchedFromPhotoPage; private boolean mInCameraApp; + private boolean mInCameraAndWantQuitOnPause; private int mLoadingBits = 0; private boolean mInitialSynced = false; @@ -427,6 +428,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster setLoadingBit(BIT_LOADING_SYNC); mSyncTask = mMediaSet.requestSync(this); } + mInCameraAndWantQuitOnPause = mInCameraApp; } @Override @@ -453,7 +455,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster // The camera app should always launch in capture mode when // resumed, so make the next resume faster by closing the grid // view now - if (mInCameraApp) { + if (mInCameraAndWantQuitOnPause) { if (mActivity.getStateManager().getTopState() == this) mActivity.getStateManager().finishState(this, false); } @@ -608,6 +610,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster return true; } case R.id.action_slideshow: { + mInCameraAndWantQuitOnPause = false; Bundle data = new Bundle(); data.putString(SlideshowPage.KEY_SET_PATH, mMediaSetPath.toString()); |