diff options
author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-13 18:44:32 +0200 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:49 -0700 |
commit | 8ba5d17c7cdeb5db9fb3db30a63eed48b608df92 (patch) | |
tree | 7dc6696d7d4de745b3b53b98a0e5bb8c16d40511 /res | |
parent | 19938c6c5bbb2ad63a2b177f92e2a497b2a4438e (diff) | |
download | android_packages_apps_Snap-8ba5d17c7cdeb5db9fb3db30a63eed48b608df92.tar.gz android_packages_apps_Snap-8ba5d17c7cdeb5db9fb3db30a63eed48b608df92.tar.bz2 android_packages_apps_Snap-8ba5d17c7cdeb5db9fb3db30a63eed48b608df92.zip |
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
Diffstat (limited to 'res')
-rw-r--r-- | res/values/cm_arrays.xml | 8 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 1a44ad17c..126fa7b96 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 e959b02a4..17528f017 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -153,14 +153,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 --> |