summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-12 19:35:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-12 19:35:22 -0700
commitb3e8fc2def7b3995c3b558d8594eb573defedf82 (patch)
treec1097190170a62beea9621d4df9c24bbc4502db5 /src
parent2061ddca51d6cc4816073c857836c9283f7853b5 (diff)
parent76c14acf3255303cc72308d938fa05bfa0d3dc3d (diff)
downloadandroid_packages_apps_Snap-b3e8fc2def7b3995c3b558d8594eb573defedf82.tar.gz
android_packages_apps_Snap-b3e8fc2def7b3995c3b558d8594eb573defedf82.tar.bz2
android_packages_apps_Snap-b3e8fc2def7b3995c3b558d8594eb573defedf82.zip
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 1719b89f9..2cb1ca2fa 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -365,6 +365,7 @@ public class AlbumSetPage extends ActivityState implements
}
private boolean setupCameraButton() {
+ if (!GalleryUtils.isCameraAvailable(mActivity)) return false;
RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
.findViewById(R.id.gallery_root);
if (galleryRoot == null) return false;