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
commitbe536c2f7882c587a2ad7fcb566b04521fe8604b (patch)
tree189b3a9dca3830c6b9a01c587ffc2e827eeda739
parented9c2b629cc43e5c61c1d016a5bcf21e086720c9 (diff)
downloadandroid_packages_apps_Snap-be536c2f7882c587a2ad7fcb566b04521fe8604b.tar.gz
android_packages_apps_Snap-be536c2f7882c587a2ad7fcb566b04521fe8604b.tar.bz2
android_packages_apps_Snap-be536c2f7882c587a2ad7fcb566b04521fe8604b.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();