diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-21 05:02:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-21 05:02:30 -0700 |
| commit | 5c05aaa8664172755c0f5cf6920e518a8abca067 (patch) | |
| tree | 594c1bcb7200b18d4c59604bf936d38b8fc8423e | |
| parent | 9718d52b226489ad60df5934fb86fed219330a91 (diff) | |
| parent | 4d37b1187636819cc06ef099fdf2ac7a5fec49f5 (diff) | |
| download | android_packages_apps_Snap-5c05aaa8664172755c0f5cf6920e518a8abca067.tar.gz android_packages_apps_Snap-5c05aaa8664172755c0f5cf6920e518a8abca067.tar.bz2 android_packages_apps_Snap-5c05aaa8664172755c0f5cf6920e518a8abca067.zip | |
Merge "SnapdragonCamera: Move focus mode to developer mode"
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 534924281..4ed6aaba0 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -179,7 +179,6 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION }; @@ -195,8 +194,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, + CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_AUTO_HDR, CameraSettings.KEY_HDR_MODE, CameraSettings.KEY_HDR_NEED_1X, |