summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGopal G Goberu <ggober@codeaurora.org>2015-08-03 14:41:41 +0530
committerGopal G Goberu <ggober@codeaurora.org>2015-08-03 14:41:44 +0530
commit35994d2a709ffd84c9a3b6e015c4a7628e8c5924 (patch)
treeefed718e76123787386f221edeea86ca807c00e8 /src
parent7933ed72d24337e94e6df73a9b30e5c009dfbd04 (diff)
downloadandroid_packages_apps_Snap-35994d2a709ffd84c9a3b6e015c4a7628e8c5924.tar.gz
android_packages_apps_Snap-35994d2a709ffd84c9a3b6e015c4a7628e8c5924.tar.bz2
android_packages_apps_Snap-35994d2a709ffd84c9a3b6e015c4a7628e8c5924.zip
Revert "SnapdragonCamera: Move focus mode to developer mode"
This reverts commit 4d37b1187636819cc06ef099fdf2ac7a5fec49f5. Change-Id: I58866cba3af38dee6416714be7458d766f7560ce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 4ed6aaba0..534924281 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -179,6 +179,7 @@ public class PhotoMenu extends MenuController
CameraSettings.KEY_ISO,
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_WHITE_BALANCE,
+ CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_REDEYE_REDUCTION
};
@@ -194,8 +195,8 @@ public class PhotoMenu extends MenuController
CameraSettings.KEY_ISO,
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_WHITE_BALANCE,
- CameraSettings.KEY_REDEYE_REDUCTION,
CameraSettings.KEY_FOCUS_MODE,
+ CameraSettings.KEY_REDEYE_REDUCTION,
CameraSettings.KEY_AUTO_HDR,
CameraSettings.KEY_HDR_MODE,
CameraSettings.KEY_HDR_NEED_1X,