SnapdragonCamera: Moving Image Stabilization option to the menu

Moving Image Stabilization option to the menu

Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b
CRs-Fixed: 937237

6 files changed, 6 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_eis_menu.png b/res/drawable-hdpi/ic_eis_menu.png
new file mode 100644
index 000000000..292be7ac5
--- /dev/null
+++ b/res/drawable-hdpi/ic_eis_menu.png
diff --git a/res/drawable-xhdpi/ic_eis_menu.png b/res/drawable-xhdpi/ic_eis_menu.png
new file mode 100644
index 000000000..01c0a6d07
--- /dev/null
+++ b/res/drawable-xhdpi/ic_eis_menu.png
diff --git a/res/drawable-xxhdpi/ic_eis_menu.png b/res/drawable-xxhdpi/ic_eis_menu.png
new file mode 100644
index 000000000..62746e18d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_eis_menu.png
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 414d8f9c8..388ac0ae5 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -314,13 +314,13 @@
      <string name="pref_camera_mce_default">enable</string>
 
      <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
-     <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for DIS/TimeLapse/HDR</string>
+     <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for Image Stabilization/TimeLapse/HDR</string>
 
      <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
      <string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string>
 
      <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
-     <string name="error_app_unsupported_dis">Unsupported video resolution for Display Image Stabilization(DIS)</string>
+     <string name="error_app_unsupported_dis">Unsupported video resolution for Image Stabilization</string>
 
      <!-- The message is shown in dialog when the app
          encounters an unsupported resolution for HSR mode -->
@@ -504,7 +504,7 @@
     <string name="pref_camera_touchafaec_entry_on">On</string>
 
     <!-- Select IS title -->
-    <string name="pref_camera_dis_title">IS</string>
+    <string name="pref_camera_dis_title">Image Stabilization</string>
     <string name="pref_camera_dis_default">disable</string>
 
     <!-- DIS choices -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1fe80abdc..a676d9c53 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -437,7 +437,7 @@
     <string name="advanced_capture_disable_continuous_shot">Enable Advanced Capture will disable Continuous Shot.</string>
 
     <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
-    <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable IS.</string>
+    <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable Image Stabilization.</string>
 
     <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
     <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 63346a0d1..f9949d4e1 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -111,11 +111,12 @@
             camera:title="@string/pref_camera_powermode_title"
             camera:entries="@array/pref_camera_powermode_entries"
             camera:entryValues="@array/pref_camera_powermode_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_dis_key"
             camera:defaultValue="@string/pref_camera_dis_default"
             camera:title="@string/pref_camera_dis_title"
             camera:entries="@array/pref_camera_dis_entries"
+            camera:singleIcon="@drawable/ic_eis_menu"
             camera:entryValues="@array/pref_camera_dis_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_coloreffect_key"