diff options
author | Arne Coucheron <arco68@gmail.com> | 2016-02-22 06:50:53 +0100 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:51 -0700 |
commit | 8c434177890485ea22c9e5379c466bdd33c22416 (patch) | |
tree | 8bf68774759b79ac3e90aaf1953618afd3c976a8 /src/com/android | |
parent | 94b749e4b79717e3a3a9db54dc4ebf5ab8cb2251 (diff) | |
download | android_packages_apps_Snap-8c434177890485ea22c9e5379c466bdd33c22416.tar.gz android_packages_apps_Snap-8c434177890485ea22c9e5379c466bdd33c22416.tar.bz2 android_packages_apps_Snap-8c434177890485ea22c9e5379c466bdd33c22416.zip |
Snap: Remove face detection option if not supported
Removes the face detection option from preference list if
the "face-detection" camera parameter is blank/doesn't exist.
Change-Id: I2ec82ae38505b6674f1a34e98d1b1fb2dbc2a714
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 8f3362c5c..eeada94de 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -151,6 +151,7 @@ public class CameraSettings { private static final String KEY_QC_SUPPORTED_VIDEO_CDS_MODES = "video-cds-mode-values"; private static final String KEY_QC_SUPPORTED_TNR_MODES = "tnr-mode-values"; private static final String KEY_QC_SUPPORTED_VIDEO_TNR_MODES = "video-tnr-mode-values"; + private static final String KEY_QC_SUPPORTED_FACE_DETECTION = "face-detection-values"; private static final String KEY_SNAPCAM_SUPPORTED_HDR_MODES = "hdr-mode-values"; private static final String KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X = "hdr-need-1x-values"; public static final String KEY_SNAPCAM_SHUTTER_SPEED = "shutter-speed"; @@ -500,6 +501,14 @@ public class CameraSettings { return split(str); } + public static List<String> getSupportedFaceDetection(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_FACE_DETECTION); + if (str == null) { + return null; + } + return split(str); + } + public static List<String> getSupportedDISModes(Parameters params) { String str = params.get(KEY_QC_SUPPORTED_DIS_MODES); if (str == null) { @@ -887,6 +896,11 @@ public class CameraSettings { faceRC, getSupportedFaceRecognitionModes(mParameters)); } + if (faceDetection != null) { + filterUnsupportedOptions(group, + faceDetection, getSupportedFaceDetection(mParameters)); + } + if (autoExposure != null) { filterUnsupportedOptions(group, autoExposure, mParameters.getSupportedAutoexposure()); |