diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-05 17:08:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 17:08:41 +0000 |
| commit | b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6 (patch) | |
| tree | c3ff795b5d55f32c61dfdd4f4272f628d856ac25 /src | |
| parent | 2f81a0fe104d8806308dc4c6056090206f13ba84 (diff) | |
| parent | 5cf3c47333d558abacd8962d68ccb1ff3e285005 (diff) | |
| download | android_packages_apps_Snap-b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6.tar.gz android_packages_apps_Snap-b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6.tar.bz2 android_packages_apps_Snap-b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6.zip | |
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 92396c71b..f9400fc99 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -69,8 +69,10 @@ public class PhotoMenu extends PieController mRenderer.addItem(item); } // exposure compensation - item = makeItem(CameraSettings.KEY_EXPOSURE, POS_EXP, 5); - mRenderer.addItem(item); + if (group.findPreference(CameraSettings.KEY_EXPOSURE) != null) { + item = makeItem(CameraSettings.KEY_EXPOSURE, POS_EXP, 5); + mRenderer.addItem(item); + } // camera switcher if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) { item = makeItem(R.drawable.ic_switch_photo_facing_holo_light); @@ -119,8 +121,10 @@ public class PhotoMenu extends PieController more.setPosition(POS_MORE, 5); mRenderer.addItem(more); // white balance - item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5); - more.addItem(item); + if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) { + item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5); + more.addItem(item); + } // settings popup mOtherKeys = new String[] { CameraSettings.KEY_SCENE_MODE, |