summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-10-20 10:55:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-20 10:55:54 -0700
commit748787fbe9455bb1aeab3670e8e5711eaf97aa1e (patch)
treebe3bff6f28dadbc59007ae2e947a6173310fddfc
parent9c69205301ac2e14d980b4d328ac7c02977ba3ab (diff)
parentbe536c2f7882c587a2ad7fcb566b04521fe8604b (diff)
downloadandroid_packages_apps_Snap-748787fbe9455bb1aeab3670e8e5711eaf97aa1e.tar.gz
android_packages_apps_Snap-748787fbe9455bb1aeab3670e8e5711eaf97aa1e.tar.bz2
android_packages_apps_Snap-748787fbe9455bb1aeab3670e8e5711eaf97aa1e.zip
am 2daced6b: Fix for active action bar in camera
* commit '2daced6baacd59850e7c64ea02f2479530654ed8': Fix for active action bar in camera
-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();