From a5c2a74498b9bec02aa842124b43d7dc6d229a4e Mon Sep 17 00:00:00 2001
From: Dimitar Borisov <dboris@codeaurora.org>
Date: Mon, 6 Oct 2014 18:38:12 +0300
Subject: SnapdragonCamera: IS is disabled when 4k video quality is enabled

- IS is disabled when 4k video quality is enabled

CRs-Fixed: 733839
Change-Id: Iaaaa779bab0fbd7f9e5e5be08c6ada1c67ceb17a
---
 res/values/qcomarrays.xml  | 4 ++--
 res/values/qcomstrings.xml | 3 +++
 res/values/strings.xml     | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 9f879ceed..98329c3bf 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -272,8 +272,8 @@
 
     <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_dis_entryvalues">
-        <item>disable</item>
-        <item>enable</item>
+        <item>@string/pref_camera_dis_value_disable</item>
+        <item>@string/pref_camera_dis_value_enable</item>
     </string-array>
 
     <!-- Face Recognition dialog box entries -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 9cd10d24f..8f2368e6e 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -423,6 +423,9 @@
     <string name="pref_camera_dis_entry_off">Off</string>
     <string name="pref_camera_dis_entry_on">On</string>
 
+    <string name="pref_camera_dis_value_disable">disable</string>
+    <string name="pref_camera_dis_value_enable">enable</string>
+
     <!-- Select Face Recognition title -->
     <string name="pref_camera_facerc_title">Face Recognition</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fe0f73586..d597e5af0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -422,9 +422,13 @@
     <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
     <string name="HDR_disable_continuous_shot">Enable HDR will disable Continuous Shot.</string>
 
+
     <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
     <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>
+
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
     <string name="pref_exposure_default" translatable="false">0</string>
-- 
cgit v1.2.3