summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-03-17 14:51:09 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-03-17 17:12:17 -0700
commit3f9376297c6c182f29ca32184448a2871afd4568 (patch)
tree1e32b8c0d5704c747c7613aea8719ff1cc0593c3 /src/com/android/camera/PhotoMenu.java
parent4052ea1c2ac2d38fe83f3f337cda8d75459ff702 (diff)
downloadandroid_packages_apps_Snap-3f9376297c6c182f29ca32184448a2871afd4568.tar.gz
android_packages_apps_Snap-3f9376297c6c182f29ca32184448a2871afd4568.tar.bz2
android_packages_apps_Snap-3f9376297c6c182f29ca32184448a2871afd4568.zip
SnapdragonCamera: Set Flash to be the first menu in settings
Change-Id: Ia451a2fff983f3bfc850f066d7346d90d0a91dab
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index be3a02c1f..5ab187a04 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -132,6 +132,7 @@ public class PhotoMenu extends MenuController
}
mOtherKeys1 = new String[] {
+ CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_RECORD_LOCATION,
CameraSettings.KEY_PICTURE_SIZE,
CameraSettings.KEY_JPEG_QUALITY,
@@ -142,12 +143,12 @@ public class PhotoMenu extends MenuController
CameraSettings.KEY_ISO,
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_WHITE_BALANCE,
- CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_REDEYE_REDUCTION
};
mOtherKeys2 = new String[] {
+ CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_RECORD_LOCATION,
CameraSettings.KEY_PICTURE_SIZE,
CameraSettings.KEY_JPEG_QUALITY,
@@ -158,7 +159,6 @@ public class PhotoMenu extends MenuController
CameraSettings.KEY_ISO,
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_WHITE_BALANCE,
- CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_REDEYE_REDUCTION,
CameraSettings.KEY_AUTO_HDR,