SnapdragonCamera: Disable filter mode when HDR is on

When HDR was on, filter mode was invalid,it has no effect on
preview, besides, scene mode had been changed to auto, but
the scene icon didn't change.

When HDR is ON, disable filter mode, and change scene mode icon
to auto.

Change-Id: I1e43021f0441b13549b6511a18252679299beec8
CRs-Fixed: 782599

1 files changed, 13 insertions, 15 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index d10a679b3..d379aad00 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -528,6 +528,7 @@ public class PhotoMenu extends MenuController
 
         ListPreference pref = mPreferenceGroup.findPreference(
                 CameraSettings.KEY_SCENE_MODE);
+        updateFilterModeIcon(pref, mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR));
         String sceneMode = (pref != null) ? pref.getValue() : null;
         pref = mPreferenceGroup.findPreference(CameraSettings.KEY_FACE_DETECTION);
         String faceDetection = (pref != null) ? pref.getValue() : null;
@@ -616,20 +617,21 @@ public class PhotoMenu extends MenuController
             }
         }
 
-        pref = mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE);
-        if (pref != null) {
-            if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) {
-                buttonSetEnabled(mFilterModeSwitcher, false);
-            } else {
-                buttonSetEnabled(mFilterModeSwitcher, true);
-            }
-        }
-
         if (mListener != null) {
             mListener.onSharedPreferenceChanged();
         }
     }
 
+    private void updateFilterModeIcon(ListPreference scenePref, ListPreference hdrPref) {
+        if (scenePref == null || hdrPref == null) return;
+        if ((notSame(scenePref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO))
+                || (notSame(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff))) {
+            buttonSetEnabled(mFilterModeSwitcher, false);
+        } else {
+            buttonSetEnabled(mFilterModeSwitcher, true);
+        }
+    }
+
     public void initSwitchItem(final String prefKey, View switcher) {
         final IconListPreference pref =
                 (IconListPreference) mPreferenceGroup.findPreference(prefKey);
@@ -1060,6 +1062,7 @@ public class PhotoMenu extends MenuController
                 Toast.makeText(mActivity, R.string.hdr_enable_message, Toast.LENGTH_LONG).show();
             }
             setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO);
+            updateSceneModeIcon((IconListPreference) scenePref);
         } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) {
             ListPreference hdrPref =
                     mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR);
@@ -1113,12 +1116,7 @@ public class PhotoMenu extends MenuController
                         mActivity.getString(R.string.pref_camera_advanced_feature_default));
             }
         }
-
-        if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) {
-            buttonSetEnabled(mFilterModeSwitcher, false);
-        } else {
-            buttonSetEnabled(mFilterModeSwitcher, true);
-        }
+        updateFilterModeIcon(pref, pref);
         super.onSettingChanged(pref);
     }