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
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-14 08:27:48 -0800
commitcd142092a0b3c947d0c5e429ec15985271b16259 (patch)
treeab08cd86b279f893e7e03eb2b8b11778cc0e8012 /src/com/android/camera/CameraSettings.java
parent4b6ac957f76dc33e77b05fe265a73737050ba50f (diff)
downloadandroid_packages_apps_Snap-cd142092a0b3c947d0c5e429ec15985271b16259.tar.gz
android_packages_apps_Snap-cd142092a0b3c947d0c5e429ec15985271b16259.tar.bz2
android_packages_apps_Snap-cd142092a0b3c947d0c5e429ec15985271b16259.zip
Snap: Remove touch AF/AEC option
* Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425
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 3e8accb1e..dbfdd049a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -87,7 +87,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";
@@ -646,7 +645,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);
@@ -716,11 +714,6 @@ public class CameraSettings {
ListPreference videoRotation = group.findPreference(KEY_VIDEO_ROTATION);
- if (touchAfAec != null) {
- filterUnsupportedOptions(group,
- touchAfAec, mParameters.getSupportedTouchAfAec());
- }
-
if (!mParameters.isPowerModeSupported() && powerMode != null) {
removePreference(group, powerMode.getKey());
}