diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-12 19:36:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 19:36:28 -0700 |
commit | 2983058be80e068b07ddca0c069b4068b1d966a5 (patch) | |
tree | 9148aef5fb9c104fc8c891b1e9129b326b9a9a53 | |
parent | a3c8da944663cdd493a7a8dea5db7de7702b29b0 (diff) | |
parent | b3e8fc2def7b3995c3b558d8594eb573defedf82 (diff) | |
download | android_packages_apps_Snap-2983058be80e068b07ddca0c069b4068b1d966a5.tar.gz android_packages_apps_Snap-2983058be80e068b07ddca0c069b4068b1d966a5.tar.bz2 android_packages_apps_Snap-2983058be80e068b07ddca0c069b4068b1d966a5.zip |
am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
* commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f':
Hide Camera button on empty gallery when not available
-rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 1 |
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; |