SnapdragonCamera: Disable color effects when scene mode is non-automatic

SceneMode and color effect filter can't be open at the same time. Color
effect filter should be disabled when scene mode was non-automatic

CRs-Fixed: 1080667
Change-Id: Icabfe937c438f38047d073af61b9ae4e1e0dcbbc

2 files changed, 68 insertions, 2 deletions

diff --git a/assets/dependency.json b/assets/dependency.json
index b8c396895..440df5bd8 100644
--- a/assets/dependency.json
+++ b/assets/dependency.json
@@ -42,15 +42,65 @@
     "100":
       {"pref_camera2_longshot_key":"off",
       "pref_camera2_mono_only_key":"off",
-      "pref_camera2_flashmode_key":"off"}
+      "pref_camera2_flashmode_key":"off",
+      "pref_camera2_coloreffect_key":"0"}
     ,
     "0":
       {"pref_camera2_clearsight_key":"off",
       "pref_camera2_mono_preview_key":"off",
       "pref_camera2_mpo_key":"off"}
     ,
+    "18":
+      {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "102":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "101":
+    {"pref_camera2_coloreffect_key":"0"}
+   ,
+    "3":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "4":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "13":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "15":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "10":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "5":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "8":
+    {"pref_camera2_coloreffect_key":"0"}
+     ,
+    "9":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "103":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "106":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "107":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "108":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
+    "104":
+    {"pref_camera2_coloreffect_key":"0"}
+    ,
     "105":
-      {"pref_camera2_flashmode_key":"off"}
+      {"pref_camera2_flashmode_key":"off",
+        "pref_camera2_coloreffect_key":"0"}
   },
   "pref_camera2_clearsight_key":
   {
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 88460b865..263b1834a 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -77,6 +77,7 @@ import org.codeaurora.snapcam.R;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 public class CaptureUI implements FocusOverlayManager.FocusUI,
         PreviewGestures.SingleTapListener,
@@ -538,6 +539,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         String value = mSettingsManager.getValue(SettingsManager.KEY_COLOR_EFFECT);
         if (value == null) return;
 
+        enableView(mFilterModeSwitcher, SettingsManager.KEY_COLOR_EFFECT);
+
         mFilterModeSwitcher.setVisibility(View.VISIBLE);
         mFilterModeSwitcher.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -548,6 +551,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         });
     }
 
+    private void enableView(View view, String key) {
+        Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap();
+        SettingsManager.Values values = map.get(key);
+        boolean enabled = values.overriddenValue == null;
+        view.setEnabled(enabled);
+    }
+
     public void showTimeLapseUI(boolean enable) {
         if (mTimeLapseLabel != null) {
             mTimeLapseLabel.setVisibility(enable ? View.VISIBLE : View.GONE);
@@ -1282,6 +1292,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
 
     @Override
     public void onSettingsChanged(List<SettingsManager.SettingState> settings) {
+        for( SettingsManager.SettingState state : settings) {
+            if( state.key.equals(SettingsManager.KEY_COLOR_EFFECT) ) {
+                enableView(mFilterModeSwitcher, SettingsManager.KEY_COLOR_EFFECT);
+                break;
+            }
+        }
     }
 
     public void startSelfieFlash() {