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, 19 insertions, 1 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 66a022b2d..bc717c71f 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -931,7 +931,7 @@ public class CameraSettings {
         if (chromaFlash != null) {
             List<String> supportedAdvancedFeatures =
                     getSupportedAdvancedFeatures(mParameters);
-            if (!CameraUtil.isSupported(
+            if (hasChromaFlashScene(mContext) || !CameraUtil.isSupported(
                         mContext.getString(R.string
                             .pref_camera_advanced_feature_value_chromaflash_on),
                         supportedAdvancedFeatures)) {
@@ -957,6 +957,13 @@ public class CameraSettings {
                 supportedSceneModes.add(mContext.getString(R.string
                             .pref_camera_advanced_feature_value_optizoom_on));
             }
+            if (hasChromaFlashScene(mContext) && CameraUtil.isSupported(
+                        mContext.getString(R.string
+                                .pref_camera_advanced_feature_value_chromaflash_on),
+                        supportedAdvancedFeatures)) {
+                supportedSceneModes.add(mContext.getString(R.string
+                            .pref_camera_advanced_feature_value_chromaflash_on));
+            }
             filterUnsupportedOptions(group, sceneMode, supportedSceneModes);
         }
         if (flashMode != null) {
@@ -1411,4 +1418,15 @@ public class CameraSettings {
         return split(str);
     }
 
+    public static boolean hasChromaFlashScene(Context context) {
+        String[] sceneModes = context.getResources().getStringArray(
+                R.array.pref_camera_scenemode_entryvalues);
+        for (String mode : sceneModes) {
+            if (mode.equals(context.getResources().getString(R.string
+                            .pref_camera_advanced_feature_value_chromaflash_on))) {
+                return true;
+            }
+        }
+        return false;
+    }
 }