commit 5cf3c47333d558abacd8962d68ccb1ff3e285005
author Michael Kolb <kolby@google.com> Fri Apr 05 09:52:55 2013 -0700
committer Michael Kolb <kolby@google.com> Fri Apr 05 09:54:32 2013 -0700
tree 823f9c566ccf9be66ceac5844593d32d93444c16
parent 8a9bee75383fba5a612c5e7ef7c6488495961bec

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

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 92396c7..f9400fc 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -69,8 +69,10 @@
             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 @@
         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,