Add more menu options/icons

  Bug: 8640131

Added location and scene mode to secondary menu
Updated HDR icons

Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4

3 files changed, 53 insertions, 6 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>
 
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 4764cd375..8c13a3422 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -35,8 +35,11 @@
             camera:key="pref_camera_scenemode_key"
             camera:defaultValue="@string/pref_camera_scenemode_default"
             camera:title="@string/pref_camera_scenemode_title"
-            camera:singleIcon="@drawable/ic_scn_holo_light"
+            camera:singleIcon="@drawable/ic_sce"
             camera:entries="@array/pref_camera_scenemode_entries"
+            camera:labelList="@array/pref_camera_scenemode_labels"
+            camera:icons="@array/pref_camera_scenemode_icons"
+            camera:largeIcons="@array/pref_camera_scenemode_icons"
             camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -54,6 +57,7 @@
             camera:icons="@array/camera_recordlocation_icons"
             camera:largeIcons="@array/camera_recordlocation_largeicons"
             camera:entries="@array/pref_camera_recordlocation_entries"
+            camera:labelList="@array/pref_camera_recordlocation_labels"
             camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
     <ListPreference
             camera:key="pref_camera_picturesize_key"
@@ -75,11 +79,13 @@
             camera:entries="@array/camera_id_entries"
             camera:labelList="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_hdr_key"
             camera:defaultValue="@string/pref_camera_hdr_default"
             camera:title="@string/pref_camera_scenemode_entry_hdr"
             camera:entries="@array/pref_camera_hdr_entries"
+            camera:icons="@array/pref_camera_hdr_icons"
+            camera:largeIcons="@array/pref_camera_hdr_icons"
             camera:labelList="@array/pref_camera_hdr_labels"
             camera:entryValues="@array/pref_camera_hdr_entryvalues" />
     <CountDownTimerPreference