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

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());