SnapdragonCamera: implement optizoom and chromaflash UI

add scene mode for optizoom and preference entry for chromaflash

Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf

9 files changed, 22 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_scene_mode_optizoom.png b/res/drawable-hdpi/ic_scene_mode_optizoom.png
new file mode 100644
index 000000000..bdf3d634a
--- /dev/null
+++ b/res/drawable-hdpi/ic_scene_mode_optizoom.png
diff --git a/res/drawable-hdpi/ic_settings_chromaflash.png b/res/drawable-hdpi/ic_settings_chromaflash.png
new file mode 100644
index 000000000..a58bc00bf
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_chromaflash.png
diff --git a/res/drawable-xhdpi/ic_scene_mode_optizoom.png b/res/drawable-xhdpi/ic_scene_mode_optizoom.png
new file mode 100644
index 000000000..8a4fc3614
--- /dev/null
+++ b/res/drawable-xhdpi/ic_scene_mode_optizoom.png
diff --git a/res/drawable-xhdpi/ic_settings_chromaflash.png b/res/drawable-xhdpi/ic_settings_chromaflash.png
new file mode 100644
index 000000000..b21a5a086
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_chromaflash.png
diff --git a/res/drawable-xxhdpi/ic_scene_mode_optizoom.png b/res/drawable-xxhdpi/ic_scene_mode_optizoom.png
new file mode 100644
index 000000000..e41b3ac23
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_scene_mode_optizoom.png
diff --git a/res/drawable-xxhdpi/ic_settings_chromaflash.png b/res/drawable-xxhdpi/ic_settings_chromaflash.png
new file mode 100644
index 000000000..d46fc49c6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_chromaflash.png
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d2c549481..b3f2d94dc 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -470,11 +470,22 @@
         <item>@drawable/ic_indicator_wb_cloudy</item>
     </array>
 
+    <string-array name="pref_camera_chromaflash_entries" translatable="false">
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
+    </string-array>
+
+    <array name="pref_camera_chromaflash_entryvalues" translatable="false">
+        <item>@string/pref_camera_advanced_feature_value_chromaflash_off</item>
+        <item>@string/pref_camera_advanced_feature_value_chromaflash_on</item>
+    </array>
+
     <!-- Camera Preferences Scene Mode dialog box entries -->
     <string-array name="pref_camera_scenemode_entries" translatable="false">
         <item>@string/pref_camera_scenemode_entry_auto</item>
         <item>@string/pref_camera_scenemode_entry_hdr</item>
         <item>@string/pref_camera_scenemode_entry_refocus</item>
+        <item>@string/pref_camera_scenemode_entry_optizoom</item>
         <item>@string/pref_camera_scenemode_entry_action</item>
         <item>@string/pref_camera_scenemode_entry_antimotionblur</item>
         <item>@string/pref_camera_scenemode_entry_aqua</item>
@@ -531,6 +542,7 @@
         <item>@drawable/ic_scene_mode_auto</item>
         <item>@drawable/ic_scene_mode_hdr</item>
         <item>@drawable/ic_scene_mode_refocus</item>
+        <item>@drawable/ic_scene_mode_optizoom</item>
         <item>@drawable/ic_scene_mode_action</item>
         <item>@drawable/ic_scene_mode_entry_antimotionblur</item>
         <item>@drawable/ic_scene_mode_entry_aqua</item>
@@ -603,6 +615,7 @@
         <item>auto</item>
         <item>hdr</item>
         <item>@string/pref_camera_advanced_feature_value_refocus_on</item>
+        <item>@string/pref_camera_advanced_feature_value_optizoom_on</item>
         <item>action</item>
         <item>anti-motion-blur</item>
         <item>aqua</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 409bca714..247e1b873 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -354,6 +354,8 @@
     <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_party">Party</string>
 
+    <string name="pref_camera_scenemode_entry_optizoom">Opti-Zoom</string>
+
     <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
     <string name="pref_camera_scenemode_label_auto">NONE</string>
     <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 3f5df1e4e..bde5a52d0 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -50,6 +50,13 @@
             camera:entries="@array/pref_camera_whitebalance_entries"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"
             camera:labelList="@array/pref_camera_whitebalance_labels" />
+    <IconListPreference
+            camera:key="chroma-flash"
+            camera:defaultValue="@string/pref_camera_advanced_feature_value_chromaflash_off"
+            camera:title="@string/pref_camera_advanced_feature_entry_chromaflash"
+            camera:singleIcon="@drawable/ic_settings_chromaflash"
+            camera:entries="@array/pref_camera_chromaflash_entries"
+            camera:entryValues="@array/pref_camera_chromaflash_entryvalues" />
     <RecordLocationPreference
             camera:key="pref_camera_recordlocation_key"
             camera:defaultValue="@string/pref_camera_recordlocation_default"