From 793e75b0bd4bfe9b6aed41d928fed49295bda63b Mon Sep 17 00:00:00 2001
From: Sultanxda <sultanxda@gmail.com>
Date: Tue, 8 Sep 2015 21:32:48 -0700
Subject: SnapdragonCamera: Add focus-mode option to camcorder

User can now control the focus mode used while recording video.

Change-Id: I340c01a3f88314de67ca024279672276eff453ed
Signed-off-by: Sultanxda <sultanxda@gmail.com>
---
 res/values/arrays.xml         |  5 -----
 res/values/cm_arrays.xml      | 16 ++++++++++++++++
 res/xml/video_preferences.xml |  7 +++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1bf6f1450..5d2e9a02e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -798,11 +798,6 @@
         <item>auto</item>
     </string-array>
 
-    <string-array name="pref_video_focusmode_default_array" translatable="false">
-        <item>continuous-video</item>
-        <item>auto</item>
-    </string-array>
-
     <!-- Icons for exposure compensation -->
     <array name="pref_camera_exposure_icons" translatable="false">
         <item>@drawable/ic_exposure_n3</item>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index d3414355d..7a1aeded0 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -92,4 +92,20 @@
         <item>30</item>
     </string-array>
 
+    <!-- Default focus mode setting.-->
+    <string-array name="pref_video_focusmode_default_array" translatable="false">
+        <item>continuous-video</item>
+        <item>auto</item>
+    </string-array>
+
+    <!-- Camcorder Preferences focus mode dialog box entries -->
+    <string-array name="pref_video_focusmode_entries" translatable="false">
+        <item>@string/pref_camera_focusmode_entry_auto</item>
+        <item>@string/pref_camera_focusmode_entry_continuous</item>
+    </string-array>
+
+    <string-array name="pref_video_focusmode_entryvalues" translatable="false">
+        <item>auto</item>
+        <item>continuous-video</item>
+    </string-array>
 </resources>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index a1902adfa..2d148163c 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -194,6 +194,13 @@
             camera:singleIcon="@drawable/ic_settings_rotation"
             camera:entries="@array/pref_camera_video_rotation_entries"
             camera:entryValues="@array/pref_camera_video_rotation_entryvalues" />
+    <IconListPreference
+            camera:key="pref_camera_video_focusmode_key"
+            camera:defaultValue="@array/pref_video_focusmode_default_array"
+            camera:title="@string/pref_camera_focusmode_title"
+            camera:singleIcon="@drawable/ic_settings_focus"
+            camera:entries="@array/pref_video_focusmode_entries"
+            camera:entryValues="@array/pref_video_focusmode_entryvalues" />
     <IconListPreference
             camera:key="pref_power_shutter"
             camera:defaultValue="@string/pref_camera_power_shutter_default"
-- 
cgit v1.2.3