diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-11-26 12:29:22 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-11-26 12:29:22 +0800 |
| commit | 048f1818ab5bff5ba97ea416a5166890c812ac1b (patch) | |
| tree | 1d5d4315d5879ad841a302c6a2acb9ae80025f25 | |
| parent | 9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981 (diff) | |
| download | packages_apps_LegacyCamera-048f1818ab5bff5ba97ea416a5166890c812ac1b.zip packages_apps_LegacyCamera-048f1818ab5bff5ba97ea416a5166890c812ac1b.tar.gz packages_apps_LegacyCamera-048f1818ab5bff5ba97ea416a5166890c812ac1b.tar.bz2 | |
Remove front/back camera switch from indicator wheel.
bug:3156676
Change-Id: Idb1052563356e54a27b2a5628c3db252d5f1ac54
| -rw-r--r-- | res/xml/video_preferences.xml | 1 | ||||
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 7972b78..cc9871d 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -67,6 +67,7 @@ camera:defaultValue="@string/pref_camera_id_default" camera:title="@string/pref_camera_id_title" camera:icons="@array/camera_id_icons" + camera:entries="@array/camera_id_entries" camera:largeIcons="@array/camera_id_largeicons"/> </PreferenceGroup> </PreferenceGroup> diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 2cf81d8..2a099a4 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1130,8 +1130,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private void initializeControlPanel() { String[] keys = new String[]{CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_COLOR_EFFECT, - CameraSettings.KEY_CAMERA_ID}; + CameraSettings.KEY_COLOR_EFFECT}; mControlPanel = (ControlPanel) findViewById(R.id.control_panel); if (mControlPanel != null) { mControlPanel.initialize(this, mPreferenceGroup, keys, true); diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index f383dd8..316bc91 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -495,8 +495,7 @@ public class VideoCamera extends NoSearchActivity String[] keys = new String[]{CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_COLOR_EFFECT, - CameraSettings.KEY_VIDEO_QUALITY, - CameraSettings.KEY_CAMERA_ID}; + CameraSettings.KEY_VIDEO_QUALITY}; mControlPanel = (ControlPanel) findViewById(R.id.control_panel); if (mControlPanel != null) { mControlPanel.initialize(this, mPreferenceGroup, keys, false); |