From f453f1cc2e2c93b4357e3b0fb140f6cd3c119440 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 18 Apr 2013 10:15:40 -0700
Subject: [PATCH] Change labels so that it doesn't clash with PanoUiLib.

  Bug 8401273
  PanoUiLib is required for all Gallery Wolfie UI.

Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
---
 res/values/attrs.xml                       |  2 +-
 res/xml/camera_preferences.xml             | 10 +++++-----
 res/xml/video_preferences.xml              |  6 +++---
 src/com/android/camera/ListPreference.java |  2 +-
 4 files changed, 10 insertions(+), 10 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"
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 9ea2e34ec..d1d34911b 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -70,7 +70,7 @@ public class ListPreference extends CameraPreference {
         setEntryValues(a.getTextArray(
                 R.styleable.ListPreference_entryValues));
         setLabels(a.getTextArray(
-                R.styleable.ListPreference_labels));
+                R.styleable.ListPreference_labelList));
         a.recycle();
     }
 
-- 
2.11.0