summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-13 18:44:32 +0200
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-07 15:05:43 -0800
commitfccd1672f53a30718d164557d6302d5c61b22225 (patch)
treed9a0ac9763ce9813a4da76ed02f64e140dd44fd5
parentfe1043717bca62c00f0da3f49528071ab05de282 (diff)
downloadandroid_packages_apps_Snap-fccd1672f53a30718d164557d6302d5c61b22225.zip
android_packages_apps_Snap-fccd1672f53a30718d164557d6302d5c61b22225.tar.gz
android_packages_apps_Snap-fccd1672f53a30718d164557d6302d5c61b22225.tar.bz2
Snap: Cleanup focus time duration entries
* Add 3s which was the default before we added the option * Remove 15/20/30s * Fix default duration Change-Id: Ieaad13f248ec9966eefb546beeb6b386156e3b11
-rw-r--r--res/values/cm_arrays.xml8
-rw-r--r--res/values/cm_strings.xml6
2 files changed, 4 insertions, 10 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 1a44ad1..126fa7b 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -28,22 +28,18 @@
<!-- Touch focus duration -->
<string-array name="pref_camera_focustime_duration_entries" translatable="false">
<item>@string/pref_camera_focustime_entry_0</item>
+ <item>@string/pref_camera_focustime_entry_3</item>
<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>200</item>
+ <item>3000</item>
<item>5000</item>
<item>10000</item>
- <item>15000</item>
- <item>20000</item>
- <item>30000</item>
<item>0x7FFFFFFF</item>
</string-array>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 03b14af..be2d328 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -198,14 +198,12 @@
<!-- 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_default" translatable="false">3000</string>
<string name="pref_camera_focustime_entry_0">0s</string>
+ <string name="pref_camera_focustime_entry_3">3s</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>
<!-- Shutter speed -->