summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.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/CameraSettings.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/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index a810ebc0e..6a97895be 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -95,7 +95,6 @@ public class CameraSettings {
public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
public static final String KEY_VIDEOCAMERA_COLOR_EFFECT = "pref_camera_video_coloreffect_key";
public static final String KEY_FACE_DETECTION = "pref_camera_facedetection_key";
- public static final String KEY_TOUCH_AF_AEC = "pref_camera_touchafaec_key";
public static final String KEY_SELECTABLE_ZONE_AF = "pref_camera_selectablezoneaf_key";
public static final String KEY_SATURATION = "pref_camera_saturation_key";
public static final String KEY_CONTRAST = "pref_camera_contrast_key";
@@ -781,7 +780,6 @@ public class CameraSettings {
ListPreference colorEffect = group.findPreference(KEY_COLOR_EFFECT);
ListPreference camcorderColorEffect = group.findPreference(KEY_VIDEOCAMERA_COLOR_EFFECT);
ListPreference faceDetection = group.findPreference(KEY_FACE_DETECTION);
- ListPreference touchAfAec = group.findPreference(KEY_TOUCH_AF_AEC);
ListPreference selectableZoneAf = group.findPreference(KEY_SELECTABLE_ZONE_AF);
ListPreference saturation = group.findPreference(KEY_SATURATION);
ListPreference contrast = group.findPreference(KEY_CONTRAST);
@@ -876,11 +874,6 @@ public class CameraSettings {
ListPreference videoRotation = group.findPreference(KEY_VIDEO_ROTATION);
- if (touchAfAec != null) {
- filterUnsupportedOptions(group,
- touchAfAec, ParametersWrapper.getSupportedTouchAfAec(mParameters));
- }
-
if (!ParametersWrapper.isPowerModeSupported(mParameters) && powerMode != null) {
removePreference(group, powerMode.getKey());
}