summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-09-18 12:02:41 +0800
committerWu-cheng Li <wuchengli@google.com>2012-09-18 12:05:57 +0800
commit4cb71a4cefa7ad7fb3bb740ff67c584e9499b535 (patch)
tree46be416efc7acfa8276fdd2dfdb78cf10984f1cf /src
parentea412e3624c23a65812e86e1d2bf2b5ae7b1ed0a (diff)
downloadandroid_packages_apps_Snap-4cb71a4cefa7ad7fb3bb740ff67c584e9499b535.tar.gz
android_packages_apps_Snap-4cb71a4cefa7ad7fb3bb740ff67c584e9499b535.tar.bz2
android_packages_apps_Snap-4cb71a4cefa7ad7fb3bb740ff67c584e9499b535.zip
Do not show edit button in secure album.
bug:7183052 Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java2
1 files changed, 2 insertions, 0 deletions
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;