Add menu labels

  Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f

1 files changed, 15 insertions, 0 deletions

diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index a29b19719..9ea2e34ec 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -40,6 +40,7 @@ public class ListPreference extends CameraPreference {
 
     private CharSequence[] mEntries;
     private CharSequence[] mEntryValues;
+    private CharSequence[] mLabels;
     private boolean mLoaded = false;
 
     public ListPreference(Context context, AttributeSet attrs) {
@@ -68,6 +69,8 @@ public class ListPreference extends CameraPreference {
         setEntries(a.getTextArray(R.styleable.ListPreference_entries));
         setEntryValues(a.getTextArray(
                 R.styleable.ListPreference_entryValues));
+        setLabels(a.getTextArray(
+                R.styleable.ListPreference_labels));
         a.recycle();
     }
 
@@ -83,6 +86,10 @@ public class ListPreference extends CameraPreference {
         return mEntryValues;
     }
 
+    public CharSequence[] getLabels() {
+        return mLabels;
+    }
+
     public void setEntries(CharSequence entries[]) {
         mEntries = entries == null ? new CharSequence[0] : entries;
     }
@@ -91,6 +98,10 @@ public class ListPreference extends CameraPreference {
         mEntryValues = values == null ? new CharSequence[0] : values;
     }
 
+    public void setLabels(CharSequence labels[]) {
+        mLabels = labels == null ? new CharSequence[0] : labels;
+    }
+
     public String getValue() {
         if (!mLoaded) {
             mValue = getSharedPreferences().getString(mKey,
@@ -135,6 +146,10 @@ public class ListPreference extends CameraPreference {
         return mEntries[findIndexOfValue(getValue())].toString();
     }
 
+    public String getLabel() {
+        return mLabels[findIndexOfValue(getValue())].toString();
+    }
+
     protected void persistStringValue(String value) {
         SharedPreferences.Editor editor = getSharedPreferences().edit();
         editor.putString(mKey, value);