From 4cb71a4cefa7ad7fb3bb740ff67c584e9499b535 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Tue, 18 Sep 2012 12:02:41 +0800 Subject: Do not show edit button in secure album. bug:7183052 Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2 --- src/com/android/gallery3d/app/PhotoPage.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index df61f89e2..69484be34 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -413,6 +413,7 @@ public class PhotoPage extends ActivityState implements private ImageView mEditButton; private void setupEditButton() { + if (mSecureAlbum != null) return; RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity) .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root); if (galleryRoot == null) return; @@ -434,6 +435,7 @@ public class PhotoPage extends ActivityState implements } private void cleanupEditButton() { + if (mEditButton == null) return; RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity) .findViewById(mAppBridge != null ? R.id.content : R.id.gallery_root); if (galleryRoot == null) return; -- cgit v1.2.3