summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-10-19 18:18:39 -0700
committerDoris Liu <tianliu@google.com>2012-10-19 18:21:43 -0700
commit2daced6baacd59850e7c64ea02f2479530654ed8 (patch)
treed85f8cbfdd415642663c2cf2889cd90ee98b5b3e
parent2f879102d630815df64636b8d37e3a7eea8e8b65 (diff)
downloadandroid_packages_apps_Gallery2-2daced6baacd59850e7c64ea02f2479530654ed8.tar.gz
android_packages_apps_Gallery2-2daced6baacd59850e7c64ea02f2479530654ed8.tar.bz2
android_packages_apps_Gallery2-2daced6baacd59850e7c64ea02f2479530654ed8.zip
Fix for active action bar in camera
Bug: 7377404 Bug: 7384972 Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 6e859a978..c8f296afc 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -436,6 +436,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
super.onPause();
mIsActive = false;
+ if (mSelectionManager.inSelectionMode()) {
+ mSelectionManager.leaveSelectionMode();
+ }
mAlbumView.setSlotFilter(null);
mAlbumDataAdapter.pause();