am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
  Change labels so that it doesn't clash with PanoUiLib.

3 files changed, 9 insertions, 9 deletions

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index cd849b62a..582ddcb4e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,7 +32,7 @@
         <attr name="defaultValue" format="string|reference" />
         <attr name="entryValues" format="reference" />
         <attr name="entries" format="reference" />
-        <attr name="labels" format="reference" />
+        <attr name="labelList" format="reference" />
     </declare-styleable>
     <declare-styleable name="IconIndicator">
         <attr name="icons" format="reference" />
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index a08dfa98a..4764cd375 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -25,7 +25,7 @@
             camera:largeIcons="@array/camera_flashmode_largeicons"
             camera:entries="@array/pref_camera_flashmode_entries"
             camera:entryValues="@array/pref_camera_flashmode_entryvalues"
-            camera:labels="@array/pref_camera_flashmode_labels" />
+            camera:labelList="@array/pref_camera_flashmode_labels" />
     <IconListPreference
             camera:key="pref_camera_exposure_key"
             camera:defaultValue="@string/pref_exposure_default"
@@ -46,7 +46,7 @@
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"
-            camera:labels="@array/pref_camera_whitebalance_labels" />
+            camera:labelList="@array/pref_camera_whitebalance_labels" />
     <RecordLocationPreference
             camera:key="pref_camera_recordlocation_key"
             camera:defaultValue="@string/pref_camera_recordlocation_default"
@@ -65,7 +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:labelList="@array/pref_camera_focusmode_labels"
             camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -73,14 +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:labelList="@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:labelList="@array/pref_camera_hdr_labels"
             camera:entryValues="@array/pref_camera_hdr_entryvalues" />
     <CountDownTimerPreference
             camera:key="pref_camera_timer_key"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index a5d9fc8a0..faf5f655b 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -37,7 +37,7 @@
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
             camera:entries="@array/pref_camera_video_flashmode_entries"
-            camera:labels="@array/pref_camera_video_flashmode_labels"
+            camera:labelList="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -46,7 +46,7 @@
             camera:icons="@array/whitebalance_icons"
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
-            camera:labels="@array/pref_camera_whitebalance_labels"
+            camera:labelList="@array/pref_camera_whitebalance_labels"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -54,7 +54,7 @@
             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:labelList="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons"/>
     <IconListPreference
             camera:key="pref_video_effect_key"