diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-02 16:28:20 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-10-02 16:35:11 -0700 |
| commit | d176eaab45af7b13d70f0bf5fbfc9c307591134d (patch) | |
| tree | f6065dee136c286e992a376ad7afc669b61a455d | |
| parent | 7067fa61419d004d4f7d016556ca40512a26a118 (diff) | |
| download | android_packages_apps_Snap-d176eaab45af7b13d70f0bf5fbfc9c307591134d.tar.gz android_packages_apps_Snap-d176eaab45af7b13d70f0bf5fbfc9c307591134d.tar.bz2 android_packages_apps_Snap-d176eaab45af7b13d70f0bf5fbfc9c307591134d.zip | |
Do not show grid/filmstrip spinner in secure camera mode
Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index e07746ed1..08214733a 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1177,8 +1177,9 @@ public class PhotoPage extends ActivityState implements mPhotoView.pause(); mHandler.removeMessages(MSG_HIDE_BARS); mActionBar.removeOnMenuVisibilityListener(mMenuVisibilityListener); - mActionBar.disableAlbumModeMenu(true); - + if (mSecureAlbum == null) { + mActionBar.disableAlbumModeMenu(true); + } onCommitDeleteImage(); mMenuExecutor.pause(); if (mMediaSet != null) mMediaSet.clearDeletion(); @@ -1261,7 +1262,10 @@ public class PhotoPage extends ActivityState implements mActionBar.setDisplayOptions( ((mSecureAlbum == null) && (mSetPathString != null)), false); mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); - mActionBar.enableAlbumModeMenu(GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED, this); + if (mSecureAlbum == null) { + mActionBar.enableAlbumModeMenu( + GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED, this); + } if (!mShowBars) { mActionBar.hide(); mActivity.getGLRoot().setLightsOutMode(true); |