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 | 8e5828374ffd5d96e7d1efeb36db1b940972b818 (patch) | |
| tree | ff287737b5d3b81565b9231ea3ee5ecfcb6f7bf6 /src | |
| parent | 9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1 (diff) | |
| download | android_packages_apps_Gallery2-8e5828374ffd5d96e7d1efeb36db1b940972b818.tar.gz android_packages_apps_Gallery2-8e5828374ffd5d96e7d1efeb36db1b940972b818.tar.bz2 android_packages_apps_Gallery2-8e5828374ffd5d96e7d1efeb36db1b940972b818.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')
| -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() { |