diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-27 23:08:11 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-07-27 23:08:11 -0600 |
| commit | 317f99a2891e83852953ce4e5e14f271a730bdd5 (patch) | |
| tree | d68831dbb42e5dfa36f12e31703679ced4109a19 /src | |
| parent | befbc11685ef65c65a4070698ba84b242bfe94f3 (diff) | |
| parent | 5c05aaa8664172755c0f5cf6920e518a8abca067 (diff) | |
| download | android_packages_apps_Snap-317f99a2891e83852953ce4e5e14f271a730bdd5.tar.gz android_packages_apps_Snap-317f99a2891e83852953ce4e5e14f271a730bdd5.tar.bz2 android_packages_apps_Snap-317f99a2891e83852953ce4e5e14f271a730bdd5.zip | |
Merge 5c05aaa8664172755c0f5cf6920e518a8abca067 on remote branch
Change-Id: I4b111d981352b99ff7f9e6c2dc43915d30aef16b
Diffstat (limited to 'src')
| -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, |