diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-04-22 16:06:25 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-04-22 16:06:25 -0700 |
| commit | 3f6b05195519445ab274b684c9eec6fd16ef7057 (patch) | |
| tree | b114d489a7b37300bc1d7f77217e9f639832b584 /src/com/android/gallery3d/app | |
| parent | 37c006fc72a6a3f849545587ad85c82466862bc4 (diff) | |
| download | android_packages_apps_Snap-3f6b05195519445ab274b684c9eec6fd16ef7057.tar.gz android_packages_apps_Snap-3f6b05195519445ab274b684c9eec6fd16ef7057.tar.bz2 android_packages_apps_Snap-3f6b05195519445ab274b684c9eec6fd16ef7057.zip | |
Make sure we don't add the pano sharing menu in the secure lock screen.
Bug: 8473022
Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 613ac17eb..7a71e9109 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -815,11 +815,13 @@ public abstract class PhotoPage extends ActivityState implements int supportedOperations = mCurrentPhoto.getSupportedOperations(); if (mSecureAlbum != null) { supportedOperations &= MediaObject.SUPPORT_DELETE; - } else if (!mHaveImageEditor) { - supportedOperations &= ~MediaObject.SUPPORT_EDIT; + } else { + mCurrentPhoto.getPanoramaSupport(mUpdatePanoramaMenuItemsCallback); + if (!mHaveImageEditor) { + supportedOperations &= ~MediaObject.SUPPORT_EDIT; + } } MenuExecutor.updateMenuOperation(menu, supportedOperations); - mCurrentPhoto.getPanoramaSupport(mUpdatePanoramaMenuItemsCallback); } private boolean canDoSlideShow() { |