summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjt1134 <jt1134@gmail.com>2013-01-12 00:35:45 -0600
committerMichael Bestas <mikeioannina@gmail.com>2015-09-20 20:02:05 +0300
commit8062e0b048dfe8604b7e4f2ba30c0f0aaaf24a0b (patch)
tree7db8280e8c8bb4c3544a53d513a3355ec5759eb8 /res
parent71f4fae6ca8c12c467b5afa8a6d325fc10b77f45 (diff)
downloadandroid_packages_apps_Snap-8062e0b048dfe8604b7e4f2ba30c0f0aaaf24a0b.tar.gz
android_packages_apps_Snap-8062e0b048dfe8604b7e4f2ba30c0f0aaaf24a0b.tar.bz2
android_packages_apps_Snap-8062e0b048dfe8604b7e4f2ba30c0f0aaaf24a0b.zip
Snap: Add touch-to-focus timeout duration settings
Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_arrays.xml20
-rw-r--r--res/values/cm_strings.xml11
-rw-r--r--res/xml/camera_preferences.xml6
3 files changed, 37 insertions, 0 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index b308c083e..94410cf48 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -24,4 +24,24 @@
<item>@string/setting_off</item>
<item>@string/setting_on</item>
</array>
+
+ <!-- Touch focus duration -->
+ <string-array name="pref_camera_focustime_duration_entries" translatable="false">
+ <item>@string/pref_camera_focustime_entry_5</item>
+ <item>@string/pref_camera_focustime_entry_10</item>
+ <item>@string/pref_camera_focustime_entry_15</item>
+ <item>@string/pref_camera_focustime_entry_20</item>
+ <item>@string/pref_camera_focustime_entry_30</item>
+ <item>@string/pref_camera_focustime_entry_infinite</item>
+ </string-array>
+
+ <!-- Stored in milliseconds -->
+ <string-array name="pref_camera_focustime_duration_values" translatable="false">
+ <item>5000</item>
+ <item>10000</item>
+ <item>15000</item>
+ <item>20000</item>
+ <item>30000</item>
+ <item>0</item>
+ </string-array>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0a9775194..b328bda18 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -150,4 +150,15 @@
<!-- Max brightness -->
<string name="pref_camera_max_brightness_title">Bright screen</string>
<string name="pref_camera_max_brightness_default" translatable="false">off</string>
+
+ <!-- Touch focus duration -->
+ <string name="pref_camera_focustime_title">Touch focus duration</string>
+ <string name="pref_camera_focustime_default" translatable="false">5000</string>
+
+ <string name="pref_camera_focustime_entry_5">5s</string>
+ <string name="pref_camera_focustime_entry_10">10s</string>
+ <string name="pref_camera_focustime_entry_15">15s</string>
+ <string name="pref_camera_focustime_entry_20">20s</string>
+ <string name="pref_camera_focustime_entry_30">30s</string>
+ <string name="pref_camera_focustime_entry_infinite">Infinite</string>
</resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 54d72424d..2fb598e0e 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -74,6 +74,12 @@
camera:entries="@array/pref_camera_focusmode_entries"
camera:labelList="@array/pref_camera_focusmode_labels"
camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
+ <ListPreference
+ camera:key="pref_camera_focustime_key"
+ camera:defaultValue="@string/pref_camera_focustime_default"
+ camera:title="@string/pref_camera_focustime_title"
+ camera:entries="@array/pref_camera_focustime_duration_entries"
+ camera:entryValues="@array/pref_camera_focustime_duration_values" />
<ListPreference
camera:key="pref_camera_ae_bracket_hdr_key"
camera:defaultValue="@string/pref_camera_ae_bracket_hdr_default"