From 5cf3c47333d558abacd8962d68ccb1ff3e285005 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Fri, 5 Apr 2013 09:52:55 -0700 Subject: Don't add unsupported options to menu Bug: 8549712 Exposure compensation and whitebalance were not checked when added to the menu. Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df --- src/com/android/camera/PhotoMenu.java | 12 ++++++++---- 1 file 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, -- cgit v1.2.3