commit 7feb17928804ddaec1e8208a6e44892fb9bf5519
author Michael Kolb <kolby@google.com> Mon Oct 15 09:15:58 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Oct 15 16:22:44 2012 -0700
tree d7140812c99bf6461b22de9f92b37c12d85245cb
parent 1088b559d681dd3b50dfc3f7867f20a6d7ae629d

Remove switcher from menu if only one camera present

  Bug: 7344724

Change-Id: I85e8cb499842888574e238259215efe76f969be2

src/com/android/camera/PhotoController.java

diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index 768532c..26e8a36 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -55,24 +55,27 @@
         addItem(CameraSettings.KEY_FLASH_MODE, FLOAT_PI_DIVIDED_BY_TWO - sweep, sweep);
         addItem(CameraSettings.KEY_EXPOSURE, 3 * FLOAT_PI_DIVIDED_BY_TWO - sweep, sweep);
         addItem(CameraSettings.KEY_WHITE_BALANCE, 3 * FLOAT_PI_DIVIDED_BY_TWO + sweep, sweep);
-        PieItem item = makeItem(R.drawable.ic_switch_photo_facing_holo_light);
-        item.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO + sweep,  sweep);
-        item.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(PieItem item) {
-                // Find the index of next camera.
-                ListPreference pref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID);
-                if (pref != null) {
-                    int index = pref.findIndexOfValue(pref.getValue());
-                    CharSequence[] values = pref.getEntryValues();
-                    index = (index + 1) % values.length;
-                    int newCameraId = Integer.parseInt((String) values[index]);
-                    mListener.onCameraPickerClicked(newCameraId);
+        if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
+            PieItem item = makeItem(R.drawable.ic_switch_photo_facing_holo_light);
+            item.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO + sweep, sweep);
+            item.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(PieItem item) {
+                    // Find the index of next camera.
+                    ListPreference camPref = mPreferenceGroup
+                            .findPreference(CameraSettings.KEY_CAMERA_ID);
+                    if (camPref != null) {
+                        int index = camPref.findIndexOfValue(camPref.getValue());
+                        CharSequence[] values = camPref.getEntryValues();
+                        index = (index + 1) % values.length;
+                        int newCameraId = Integer
+                                .parseInt((String) values[index]);
+                        mListener.onCameraPickerClicked(newCameraId);
+                    }
                 }
-            }
-        });
-        mRenderer.addItem(item);
+            });
+            mRenderer.addItem(item);
+        }
         if (group.findPreference(CameraSettings.KEY_CAMERA_HDR) != null) {
             PieItem hdr = makeItem(R.drawable.ic_hdr);
             hdr.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO, sweep);
@@ -97,7 +100,7 @@
                 CameraSettings.KEY_RECORD_LOCATION,
                 CameraSettings.KEY_PICTURE_SIZE,
                 CameraSettings.KEY_FOCUS_MODE};
-        item = makeItem(R.drawable.ic_settings_holo_light);
+        PieItem item = makeItem(R.drawable.ic_settings_holo_light);
         item.setFixedSlice(FLOAT_PI_DIVIDED_BY_TWO * 3, sweep);
         item.setOnClickListener(new OnClickListener() {
             @Override