snap: Fixes for advanced features and scene modes

 * Get rid of the annoying toast when longshot is disabled
 * Add support for ChromaFlash as a scene mode
 * Adjust overrides for various scene modes

Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 35d721d3e..6b40e0c71 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1168,6 +1168,18 @@ public class PhotoMenu extends MenuController
                         mActivity.getString(R.string.pref_camera_advanced_feature_default));
             }
         }
+
+        String chromaFlashOn = mActivity.getString(R.string
+                .pref_camera_advanced_feature_value_chromaflash_on);
+        if (notSame(pref, CameraSettings.KEY_SCENE_MODE, chromaFlashOn)) {
+            ListPreference lp = mPreferenceGroup
+                    .findPreference(CameraSettings.KEY_ADVANCED_FEATURES);
+            if (lp != null && chromaFlashOn.equals(lp.getValue())) {
+                setPreference(CameraSettings.KEY_ADVANCED_FEATURES,
+                        mActivity.getString(R.string.pref_camera_advanced_feature_default));
+            }
+        }
+
         updateFilterModeIcon(pref, pref);
         super.onSettingChanged(pref);
     }