From 3f6b05195519445ab274b684c9eec6fd16ef7057 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Mon, 22 Apr 2013 16:06:25 -0700
Subject: 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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

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() {
-- 
cgit v1.2.3