SnapdragonCamera: Color Effect shows the current status

Let the icon shows the current status of the color effect on/off

Change-Id: I1c3719db15d4dd920b89591064cda372c7ab89be
CRs-Fixed: 951550

10 files changed, 35 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_settings_filter.png b/res/drawable-hdpi/ic_settings_filter.png
index 30b9e0a0d..a50d758fb 100644
--- a/res/drawable-hdpi/ic_settings_filter.png
+++ b/res/drawable-hdpi/ic_settings_filter.png
diff --git a/res/drawable-hdpi/ic_settings_filter_on.png b/res/drawable-hdpi/ic_settings_filter_on.png
new file mode 100644
index 000000000..32835f907
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_filter_on.png
diff --git a/res/drawable-xhdpi/ic_settings_filter.png b/res/drawable-xhdpi/ic_settings_filter.png
index 6d274327c..1d8d4a55c 100644
--- a/res/drawable-xhdpi/ic_settings_filter.png
+++ b/res/drawable-xhdpi/ic_settings_filter.png
diff --git a/res/drawable-xhdpi/ic_settings_filter_on.png b/res/drawable-xhdpi/ic_settings_filter_on.png
new file mode 100644
index 000000000..c1e518e33
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_filter_on.png
diff --git a/res/drawable-xxhdpi/ic_settings_filter.png b/res/drawable-xxhdpi/ic_settings_filter.png
index 06bdd140e..4ecb0550a 100644
--- a/res/drawable-xxhdpi/ic_settings_filter.png
+++ b/res/drawable-xxhdpi/ic_settings_filter.png
diff --git a/res/drawable-xxhdpi/ic_settings_filter_on.png b/res/drawable-xxhdpi/ic_settings_filter_on.png
new file mode 100644
index 000000000..048c08772
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_filter_on.png
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index f54c22971..5b99bdc28 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -788,6 +788,15 @@
         <item>On</item>
     </string-array>
 
+    <string-array name="pref_camera_filter_mode_entries" translatable="false">
+        <item>@string/pref_camera_filter_mode_entry_off</item>
+        <item>@string/pref_camera_filter_mode_entry_on</item>
+    </string-array>
+    <string-array name="pref_camera_filter_mode_entryvalues" translatable="false">
+        <item>Off</item>
+        <item>On</item>
+    </string-array>
+
     <!-- Camera Preferences Color effect dialog box entries -->
     <string-array name="pref_camera_tsmakeup_level_entries" translatable="false">
         <item>@string/pref_camera_tsmakeup_entry_off</item>
@@ -816,6 +825,9 @@
         <item>@drawable/ic_ts_makeup_off</item>
         <item>@drawable/ic_ts_makeup_on</item>
     </string-array>
-
+    <string-array name="pref_filter_mode_icons" translatable="false">
+        <item>@drawable/ic_settings_filter</item>
+        <item>@drawable/ic_settings_filter_on</item>
+    </string-array>
 </resources>
 
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 115a6ffa7..97576fbae 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -471,9 +471,12 @@
 
         <!-- Default color effect setting. -->
     <string name="pref_camera_coloreffect_default" translatable="false">none</string>
+    <string name="pref_camera_filter_mode_entry_on">On</string>
+    <string name="pref_camera_filter_mode_entry_off">Off</string>
 
     <!-- Settings screen, Select Color effect title -->
-    <string name="pref_camera_coloreffect_title">Color effect</string>
+    <string name="pref_camera_coloreffect_title">Color effect Level</string>
+    <string name="pref_camera_filter_mode_title">Color effect Mode</string>
 
     <!-- Settings screen, Color effect dialog radio button choices -->
     <string name="pref_camera_coloreffect_entry_none">None</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c6e625835..8a0668fa0 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -149,6 +149,15 @@
             camera:entries="@array/pref_camera_facerc_entries"
             camera:entryValues="@array/pref_camera_facerc_entryvalues" />
     <IconListPreference
+            camera:key="pref_camera_filter_mode_key"
+            camera:defaultValue="@string/pref_camera_coloreffect_default"
+            camera:title="@string/pref_camera_filter_mode_title"
+            camera:entries="@array/pref_camera_filter_mode_entries"
+            camera:singleIcon="@drawable/ic_settings_filter"
+            camera:icons="@array/pref_filter_mode_icons"
+            camera:largeIcons="@array/pref_filter_mode_icons"
+            camera:entryValues="@array/pref_camera_filter_mode_entryvalues" />
+    <IconListPreference
             camera:key="pref_camera_coloreffect_key"
             camera:defaultValue="@string/pref_camera_coloreffect_default"
             camera:title="@string/pref_camera_coloreffect_title"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index f9949d4e1..0184bad1a 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -119,6 +119,15 @@
             camera:singleIcon="@drawable/ic_eis_menu"
             camera:entryValues="@array/pref_camera_dis_entryvalues" />
     <IconListPreference
+            camera:key="pref_camera_filter_mode_key"
+            camera:defaultValue="@string/pref_camera_coloreffect_default"
+            camera:title="@string/pref_camera_filter_mode_title"
+            camera:entries="@array/pref_camera_filter_mode_entries"
+            camera:singleIcon="@drawable/ic_settings_filter"
+            camera:icons="@array/pref_filter_mode_icons"
+            camera:largeIcons="@array/pref_filter_mode_icons"
+            camera:entryValues="@array/pref_camera_filter_mode_entryvalues" />
+    <IconListPreference
             camera:key="pref_camera_coloreffect_key"
             camera:defaultValue="@string/pref_camera_coloreffect_default"
             camera:title="@string/pref_camera_coloreffect_title"