diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:38 +0200 |
| commit | b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf (patch) | |
| tree | 68178ce3c29d69c6eb89ae188b70d7c5bcccbc3d /res/values | |
| parent | 21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef (diff) | |
| download | android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.tar.gz android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.tar.bz2 android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.zip | |
Camera: Powerkey shutter (2/2)
Ported from cm-10.1
Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.
Includes http://review.cyanogenmod.org/56986
[mikeioannina]: Updates for L
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/cm_arrays.xml | 27 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 4 |
2 files changed, 31 insertions, 0 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml new file mode 100644 index 000000000..b308c083e --- /dev/null +++ b/res/values/cm_arrays.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013-2015 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="pref_switch_entryvalues" translatable="false"> + <item>off</item> + <item>on</item> + </string-array> + + <array name="pref_switch_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </array> +</resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 2bef937e1..fbd79a019 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -141,4 +141,8 @@ <!-- Red eye flash mode title --> <string name="pref_camera_flashmode_entry_redeye">Red eye</string> <string name="pref_camera_flashmode_label_redeye">RED EYE</string> + + <!-- Power shutter --> + <string name="pref_camera_power_shutter_title">Power shutter</string> + <string name="pref_camera_power_shutter_default" translatable="false">off</string> </resources> |