summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-09-08 21:32:48 -0700
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:49 -0700
commit793e75b0bd4bfe9b6aed41d928fed49295bda63b (patch)
tree32fb18d4d4e7e4bcaced9fd0bcf1b72937ad23f5 /res
parent3fd5c59a81eabe823570e703254fc33a16a4ec46 (diff)
downloadandroid_packages_apps_Snap-793e75b0bd4bfe9b6aed41d928fed49295bda63b.tar.gz
android_packages_apps_Snap-793e75b0bd4bfe9b6aed41d928fed49295bda63b.tar.bz2
android_packages_apps_Snap-793e75b0bd4bfe9b6aed41d928fed49295bda63b.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 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
@@ -195,6 +195,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_power_shutter"
camera:defaultValue="@string/pref_camera_power_shutter_default"
camera:title="@string/pref_camera_power_shutter_title"