diff options
author | Arne Coucheron <arco68@gmail.com> | 2016-02-22 06:50:53 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:03:33 +0100 |
commit | 1ca9a9efa6fe66a574bbe51cf716707a1fe12267 (patch) | |
tree | 31596a530acd3654c6600d807bba2c7911ee6e19 /src/com/android | |
parent | 0c53b132d2dfea46236ad857019b6f2018a63a9e (diff) | |
download | android_packages_apps_Snap-1ca9a9efa6fe66a574bbe51cf716707a1fe12267.tar.gz android_packages_apps_Snap-1ca9a9efa6fe66a574bbe51cf716707a1fe12267.tar.bz2 android_packages_apps_Snap-1ca9a9efa6fe66a574bbe51cf716707a1fe12267.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 4d248f017..d147a4af2 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -157,6 +157,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"; @@ -544,6 +545,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) { @@ -955,6 +964,11 @@ public class CameraSettings { faceRC, getSupportedFaceRecognitionModes(mParameters)); } + if (faceDetection != null) { + filterUnsupportedOptions(group, + faceDetection, getSupportedFaceDetection(mParameters)); + } + if (autoExposure != null) { filterUnsupportedOptions(group, autoExposure, ParametersWrapper.getSupportedAutoexposure(mParameters)); |