diff options
| author | Doris Liu <tianliu@google.com> | 2012-10-23 18:55:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 18:55:05 -0700 |
| commit | ebef2f0ad3d49849040f2c23ff9e69753791258e (patch) | |
| tree | 542c727b132884e0ec8915cc2c25851366860ce3 /src/com/android/gallery3d/app/AlbumPage.java | |
| parent | 0763e4e0cc7d5495b703e813f21c7e6982a9ed9e (diff) | |
| parent | 3e23efc9cd3db42561f6b241c79c6d80aae53507 (diff) | |
| download | android_packages_apps_Snap-ebef2f0ad3d49849040f2c23ff9e69753791258e.tar.gz android_packages_apps_Snap-ebef2f0ad3d49849040f2c23ff9e69753791258e.tar.bz2 android_packages_apps_Snap-ebef2f0ad3d49849040f2c23ff9e69753791258e.zip | |
am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '5d3e665359272f8b7b379461ede24918d6b4537e':
Stay in AlbumPage when dismissing a popup from AP
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 8 |
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 |