commit 8e5828374ffd5d96e7d1efeb36db1b940972b818
author Sascha Haeberling <haeberling@google.com> Mon Apr 22 16:06:25 2013 -0700
committer Sascha Haeberling <haeberling@google.com> Mon Apr 22 16:06:25 2013 -0700
tree ff287737b5d3b81565b9231ea3ee5ecfcb6f7bf6
parent 9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1

Make sure we don't add the pano sharing menu in the secure lock screen.

  Bug: 8473022

Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3

src/com/android/gallery3d/app/PhotoPage.java

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 613ac17..7a71e91 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -815,11 +815,13 @@
         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() {