summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-18 12:31:10 -0700
committerMichael Kolb <kolby@google.com>2013-04-18 14:31:18 -0700
commitb4524a16022b35d1c76dfb8580d83f7fdd91dc36 (patch)
treefa2d388ca4e74fc666331d686d49a1df153bad63 /res/values
parent06fe6accb6abb284b77acd66e8db98421024b99b (diff)
downloadandroid_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.tar.gz
android_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.tar.bz2
android_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.zip
Add more menu options/icons
Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml34
-rw-r--r--res/values/strings.xml15
2 files changed, 45 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 992db8e92..7a6859bc3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -268,14 +268,19 @@
<item>@string/setting_on</item>
</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>
+ </array>
+
<array name="camera_recordlocation_icons" translatable="false">
- <item>@drawable/ic_menuselect_gps_off</item>
- <item>@drawable/ic_menuselect_gps_on</item>
+ <item>@drawable/ic_location_off</item>
+ <item>@drawable/ic_location</item>
</array>
<array name="camera_recordlocation_largeicons" translatable="false">
- <item>@drawable/ic_viewfinder_gps_off</item>
- <item>@drawable/ic_viewfinder_gps_on</item>
+ <item>@drawable/ic_location_off</item>
+ <item>@drawable/ic_location</item>
</array>
<!-- Camera Preferences White Balance dialog box entries -->
@@ -328,6 +333,22 @@
<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_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_sunset</item>
+ <item>@drawable/ic_sce_party</item>
+ </array>
+
<string-array name="pref_camera_scenemode_entryvalues" translatable="false">
<item>auto</item>
<item>action</item>
@@ -405,6 +426,11 @@
<item>@string/pref_camera_hdr_label_on</item>
</string-array>
+ <string-array name="pref_camera_hdr_icons" translatable="false">
+ <item>@drawable/ic_hdr_off</item>
+ <item>@drawable/ic_hdr</item>
+ </string-array>
+
<string-array name="pref_camera_hdr_entryvalues" translatable="false">
<item>@string/setting_off_value</item>
<item>@string/setting_on_value</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8fa8f3471..d08f70a16 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -617,6 +617,10 @@
<string name="pref_camera_recordlocation_default" translatable="false">none</string>
+ <!-- Label for record location preference [CHAR LIMIT=50] -->
+ <string name="pref_camera_location_label_on">RECORD LOCATION</string>
+ <string name="pref_camera_location_label_off">NO LOCATION</string>
+
<!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
<string name="pref_camera_timer_title">Countdown timer</string>
@@ -764,6 +768,17 @@
<!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
<string name="pref_camera_scenemode_entry_party">Party</string>
+ <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+ <string name="pref_camera_scenemode_label_auto">AUTO</string>
+ <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+ <string name="pref_camera_scenemode_label_action">ACTION</string>
+ <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+ <string name="pref_camera_scenemode_label_night">NIGHT</string>
+ <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+ <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
+ <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+ <string name="pref_camera_scenemode_label_party">PARTY</string>
+
<!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
<string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>