diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-04-22 23:55:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-22 23:55:04 +0000 |
| commit | d313bb0acf2bc8b1114180fa9a7f50d6393168a2 (patch) | |
| tree | efe974e3c795cd2a56f45c8b993eb9ad249d60ca /src | |
| parent | 98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2 (diff) | |
| parent | 8e5828374ffd5d96e7d1efeb36db1b940972b818 (diff) | |
| download | android_packages_apps_Gallery2-d313bb0acf2bc8b1114180fa9a7f50d6393168a2.tar.gz android_packages_apps_Gallery2-d313bb0acf2bc8b1114180fa9a7f50d6393168a2.tar.bz2 android_packages_apps_Gallery2-d313bb0acf2bc8b1114180fa9a7f50d6393168a2.zip | |
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
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() { |