From 317b5997e9b3f5bb6d30d1f447b2736418630502 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 10 Apr 2013 08:50:51 -0700
Subject: Add menu labels

  Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
---
 res/xml/camera_preferences.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'res/xml/camera_preferences.xml')

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 741fb1f8c..a08dfa98a 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -24,7 +24,8 @@
             camera:icons="@array/camera_flashmode_icons"
             camera:largeIcons="@array/camera_flashmode_largeicons"
             camera:entries="@array/pref_camera_flashmode_entries"
-            camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
+            camera:entryValues="@array/pref_camera_flashmode_entryvalues"
+            camera:labels="@array/pref_camera_flashmode_labels" />
     <IconListPreference
             camera:key="pref_camera_exposure_key"
             camera:defaultValue="@string/pref_exposure_default"
@@ -44,7 +45,8 @@
             camera:icons="@array/whitebalance_icons"
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
-            camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
+            camera:entryValues="@array/pref_camera_whitebalance_entryvalues"
+            camera:labels="@array/pref_camera_whitebalance_labels" />
     <RecordLocationPreference
             camera:key="pref_camera_recordlocation_key"
             camera:defaultValue="@string/pref_camera_recordlocation_default"
@@ -63,6 +65,7 @@
             camera:defaultValue="@array/pref_camera_focusmode_default_array"
             camera:title="@string/pref_camera_focusmode_title"
             camera:entries="@array/pref_camera_focusmode_entries"
+            camera:labels="@array/pref_camera_focusmode_labels"
             camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -70,12 +73,14 @@
             camera:title="@string/pref_camera_id_title"
             camera:icons="@array/camera_id_icons"
             camera:entries="@array/camera_id_entries"
+            camera:labels="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons" />
     <ListPreference
             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:labels="@array/pref_camera_hdr_labels"
             camera:entryValues="@array/pref_camera_hdr_entryvalues" />
     <CountDownTimerPreference
             camera:key="pref_camera_timer_key"
-- 
cgit v1.2.3