1 files changed, 18 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index b5ac8b3ee..7ab45fbdc 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -44,7 +44,10 @@ import android.util.Range;
 import android.util.Rational;
 import android.util.Size;
 
+import com.android.camera.imageprocessor.filter.BeautificationFilter;
 import com.android.camera.imageprocessor.filter.OptizoomFilter;
+import com.android.camera.imageprocessor.filter.TrackingFocusFrameListener;
+import com.android.camera.imageprocessor.filter.UbifocusFilter;
 import com.android.camera.ui.ListMenu;
 import com.android.camera.util.SettingTranslation;
 
@@ -71,6 +74,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
     // Custom-Scenemodes start from 100
     public static final int SCENE_MODE_DUAL_INT = 100;
     public static final int SCENE_MODE_OPTIZOOM_INT = 101;
+    public static final int SCENE_MODE_UBIFOCUS_INT = 102;
     public static final String SCENE_MODE_DUAL_STRING = "100";
     public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key";
     public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key";
@@ -493,6 +497,8 @@ public class SettingsManager implements ListMenu.SettingsListener {
         ListPreference noiseReduction = mPreferenceGroup.findPreference(KEY_NOISE_REDUCTION);
         ListPreference videoFlash = mPreferenceGroup.findPreference(KEY_VIDEO_FLASH_MODE);
         ListPreference faceDetection = mPreferenceGroup.findPreference(KEY_FACE_DETECTION);
+        ListPreference makeup = mPreferenceGroup.findPreference(KEY_MAKEUP);
+        ListPreference trackingfocus = mPreferenceGroup.findPreference(KEY_TRACKINGFOCUS);
 
         if (whiteBalance != null) {
             CameraSettings.filterUnsupportedOptions(mPreferenceGroup,
@@ -568,6 +574,16 @@ public class SettingsManager implements ListMenu.SettingsListener {
             if (!isFaceDetectionSupported(cameraId))
                 removePreference(mPreferenceGroup, KEY_FACE_DETECTION);
         }
+
+        if (makeup != null) {
+            if (!BeautificationFilter.isSupportedStatic())
+                removePreference(mPreferenceGroup, KEY_MAKEUP);
+        }
+
+        if (trackingfocus != null) {
+            if (!TrackingFocusFrameListener.isSupportedStatic())
+                removePreference(mPreferenceGroup, KEY_TRACKINGFOCUS);
+        }
     }
 
     private void buildExposureCompensation(int cameraId) {
@@ -823,7 +839,8 @@ public class SettingsManager implements ListMenu.SettingsListener {
         List<String> modes = new ArrayList<>();
         modes.add("0"); // need special case handle for auto scene mode
         if (mIsMonoCameraPresent) modes.add(SCENE_MODE_DUAL_STRING); // need special case handle for dual mode
-        if (OptizoomFilter.isSupportedStatic()) modes.add(SCENE_MODE_OPTIZOOM_INT + ""); // need special case handle for dual mode
+        if (OptizoomFilter.isSupportedStatic()) modes.add(SCENE_MODE_OPTIZOOM_INT + "");
+        if (UbifocusFilter.isSupportedStatic() && cameraId == CaptureModule.BAYER_ID) modes.add(SCENE_MODE_UBIFOCUS_INT + "");
         for (int mode : sceneModes) {
             modes.add("" + mode);
         }