summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-10-05 18:14:38 +0800
committerChung-yih Wang <cywang@google.com>2011-10-05 18:33:43 +0800
commit2fc09f97eceef3659572d695cadd791b4dcfd19c (patch)
treeed075215369b52d80bd1ed2f552a69338a8cafec /src/com/android/camera/Camera.java
parent2aa8185ae2efbafd7e4efd65fdf798819058c600 (diff)
downloadLegacyCamera-2fc09f97eceef3659572d695cadd791b4dcfd19c.zip
LegacyCamera-2fc09f97eceef3659572d695cadd791b4dcfd19c.tar.gz
LegacyCamera-2fc09f97eceef3659572d695cadd791b4dcfd19c.tar.bz2
Rearrange the second level indicator set.
bug:5360827 +change the icon spacing to 16dp +Store the geodata in the video. Change-Id: I133871066b6b9a8918f861f0510e3996d5b0f839
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 10f0b80..74a1b37 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -941,12 +941,12 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
final String[] SETTING_KEYS = {
CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_WHITE_BALANCE,
+ CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_SCENE_MODE};
final String[] OTHER_SETTING_KEYS = {
CameraSettings.KEY_RECORD_LOCATION,
- CameraSettings.KEY_FOCUS_MODE,
- CameraSettings.KEY_EXPOSURE,
- CameraSettings.KEY_PICTURE_SIZE};
+ CameraSettings.KEY_PICTURE_SIZE,
+ CameraSettings.KEY_FOCUS_MODE};
CameraPicker.setImageResourceId(R.drawable.ic_switch_photo_facing_holo_light);
mIndicatorControlContainer.initialize(this, mPreferenceGroup,