Fix for active action bar in camera

Bug: 7377404
Bug: 7384972
Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 6e859a9..c8f296a 100644 (file)
--- 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();