summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-19 14:04:01 -0700
committerMichael Kolb <kolby@google.com>2013-04-19 14:04:01 -0700
commite7cb33d130d2e86f4ef664b9203167afbfee42ff (patch)
tree9566c0033bcdfa2a7edce9f6e308fc0ca2ca17da /res/values/arrays.xml
parent0732c0cf88176d3e0353ccc91d43a28e2b7015b4 (diff)
downloadandroid_packages_apps_Snap-e7cb33d130d2e86f4ef664b9203167afbfee42ff.tar.gz
android_packages_apps_Snap-e7cb33d130d2e86f4ef664b9203167afbfee42ff.tar.bz2
android_packages_apps_Snap-e7cb33d130d2e86f4ef664b9203167afbfee42ff.zip
Fix labels
Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r--res/values/arrays.xml26
1 files changed, 18 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7a6859bc3..7ad62fa56 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -269,8 +269,8 @@
</array>
<array name="pref_camera_recordlocation_labels" translatable="false">
- <item>@string/pref_camera_location_label_on</item>
- <item>@string/pref_camera_location_label_off</item>
+ <item>@string/pref_camera_location_label</item>
+ <item>@string/pref_camera_location_label</item>
</array>
<array name="camera_recordlocation_icons" translatable="false">
@@ -326,33 +326,33 @@
<!-- Camera Preferences Scene Mode dialog box entries -->
<string-array name="pref_camera_scenemode_entries" translatable="false">
- <item>@string/pref_camera_scenemode_entry_auto</item>
<item>@string/pref_camera_scenemode_entry_action</item>
<item>@string/pref_camera_scenemode_entry_night</item>
+ <item>@string/pref_camera_scenemode_entry_auto</item>
<item>@string/pref_camera_scenemode_entry_sunset</item>
<item>@string/pref_camera_scenemode_entry_party</item>
</string-array>
<string-array name="pref_camera_scenemode_labels">
- <item>@string/pref_camera_scenemode_label_auto</item>
<item>@string/pref_camera_scenemode_label_action</item>
<item>@string/pref_camera_scenemode_label_night</item>
+ <item>@string/pref_camera_scenemode_label_auto</item>
<item>@string/pref_camera_scenemode_label_sunset</item>
<item>@string/pref_camera_scenemode_label_party</item>
</string-array>
<array name="pref_camera_scenemode_icons">
- <item>@drawable/ic_sce</item>
<item>@drawable/ic_sce_action</item>
<item>@drawable/ic_sce_night</item>
+ <item>@drawable/ic_sce</item>
<item>@drawable/ic_sce_sunset</item>
<item>@drawable/ic_sce_party</item>
</array>
<string-array name="pref_camera_scenemode_entryvalues" translatable="false">
- <item>auto</item>
<item>action</item>
<item>night</item>
+ <item>auto</item>
<item>sunset</item>
<item>party</item>
</string-array>
@@ -422,8 +422,8 @@
</string-array>
<string-array name="pref_camera_hdr_labels" translatable="false">
- <item>@string/pref_camera_hdr_label_off</item>
- <item>@string/pref_camera_hdr_label_on</item>
+ <item>@string/pref_camera_hdr_label</item>
+ <item>@string/pref_camera_hdr_label</item>
</string-array>
<string-array name="pref_camera_hdr_icons" translatable="false">
@@ -462,4 +462,14 @@
<item>@drawable/ic_exposure_p2</item>
<item>@drawable/ic_exposure_p3</item>
</array>
+
+ <!-- Labels for Countdown timer -->
+ <string-array name="pref_camera_countdown_labels">
+ <item>@string/pref_camera_countdown_label_off</item>
+ <item>@string/pref_camera_countdown_label_one</item>
+ <item>@string/pref_camera_countdown_label_three</item>
+ <item>@string/pref_camera_countdown_label_ten</item>
+ <item>@string/pref_camera_countdown_label_fifteen</item>
+ </string-array>
+
</resources>