Merge "Fix labels" into gb-ub-photos-bryce

2 files changed, 33 insertions, 13 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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d08f70a16..e4a0f9d30 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -618,8 +618,7 @@
     <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>
+    <string name="pref_camera_location_label">LOCATION</string>
 
     <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
     <string name="pref_camera_timer_title">Countdown timer</string>
@@ -779,6 +778,19 @@
     <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
     <string name="pref_camera_scenemode_label_party">PARTY</string>
 
+    <!-- Settings menu countdown timer labels [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label">COUNTDOWN TIMER</string>
+    <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label_off">TIMER OFF</string>
+    <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label_one">1 SECOND</string>
+    <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label_three">3 SECONDS</string>
+    <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
+    <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+    <string name="pref_camera_countdown_label_fifteen">15 SECONDS</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>
 
@@ -792,9 +804,7 @@
     <string name="pref_camera_hdr_default">@string/setting_off_value</string>
 
     <!-- HDR label ON [CHAR LIMIT=60] -->
-    <string name="pref_camera_hdr_label_on">HDR OFF</string>
-    <!-- HDR label OFF [CHAR LIMIT=60] -->
-    <string name="pref_camera_hdr_label_off">HDR ON</string>
+    <string name="pref_camera_hdr_label">HDR</string>
 
     <!-- switch camera label back [CHAR LIMIT=60] -->
     <string name="pref_camera_id_label_back">FRONT CAMERA</string>