summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-09-08 21:32:48 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-07 15:04:23 -0800
commitb562c16cb859a45218873957583712d018bf9326 (patch)
tree89a1e6c677e3b7cc3bddd2b8efdaa2743bfd5fd3 /res
parentab30dbecd443fefc046f820d90c98a469a2696c6 (diff)
downloadandroid_packages_apps_Snap-b562c16cb859a45218873957583712d018bf9326.tar.gz
android_packages_apps_Snap-b562c16cb859a45218873957583712d018bf9326.tar.bz2
android_packages_apps_Snap-b562c16cb859a45218873957583712d018bf9326.zip
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>
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml5
-rw-r--r--res/values/cm_arrays.xml16
-rw-r--r--res/xml/video_preferences.xml7
3 files changed, 23 insertions, 5 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b8253d685..94ae584cb 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -751,11 +751,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 7c4cffbaf..0ce03a175 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -166,6 +166,13 @@
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_camera_antibanding_key"
camera:defaultValue="@string/pref_camera_antibanding_default"
camera:title="@string/pref_camera_antibanding_title"