summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-25 15:10:58 -0800
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:56 +0100
commitd65ab55fff3f20affe650a4b6a1477f9a7d845c0 (patch)
treeb41403934e27067a05c338971d128b63207be70c /src/com/android/camera/PhotoMenu.java
parent3c70192ac84f19841cc4422410c7560f3fe69812 (diff)
downloadandroid_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.tar.gz
android_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.tar.bz2
android_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.zip
Snap: Remove touch AF/AEC option
* Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425 (cherry picked from commit 8ba41f452222c87a733fd2d045f9c513fd8d7799)
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index bcb4bc7a7..3b9e8a83f 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -236,7 +236,6 @@ public class PhotoMenu extends MenuController
CameraSettings.KEY_ZSL,
CameraSettings.KEY_TIMER_SOUND_EFFECTS,
CameraSettings.KEY_FACE_RECOGNITION,
- CameraSettings.KEY_TOUCH_AF_AEC,
CameraSettings.KEY_SELECTABLE_ZONE_AF,
CameraSettings.KEY_PICTURE_FORMAT,
CameraSettings.KEY_SATURATION,
@@ -704,7 +703,6 @@ public class PhotoMenu extends MenuController
|| ((autohdr != null) && autohdr.equals("enable"))) {
popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE, false);
- popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_SATURATION, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_CONTRAST, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_SHARPNESS, false);
@@ -767,7 +765,6 @@ public class PhotoMenu extends MenuController
popup1.setPreferenceEnabled(CameraSettings.KEY_REDEYE_REDUCTION, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT, false);
- popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false);
setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);