Revert "Camera2: Fix WB onScreenIndicator when some are settings filtered out."

* This is obsolete with the new WB mode picker and the AOSP fix

This reverts commit ede1eb17b2e36bfc867ba85877f686674d682d0e.

Change-Id: I77b89278276b67c7ae329e14b56ca3800aa98f42

2 files changed, 1 insertions, 34 deletions

diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index de050b93e..202b408d4 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -42,7 +42,6 @@ public class ListPreference extends CameraPreference {
 
     private CharSequence[] mEntries;
     private CharSequence[] mEntryValues;
-    private CharSequence[] mUnfilteredEntryValues;
     private CharSequence[] mLabels;
     private int mIconId;
     private boolean mLoaded = false;
@@ -106,7 +105,6 @@ public class ListPreference extends CameraPreference {
 
     public void setEntryValues(CharSequence values[]) {
         mEntryValues = values == null ? new CharSequence[0] : values;
-        mUnfilteredEntryValues = values == null ? new CharSequence[0] : values;
     }
 
     public void setLabels(CharSequence labels[]) {
@@ -155,21 +153,10 @@ public class ListPreference extends CameraPreference {
         return -1;
     }
 
-    public int findUnfilteredIndexOfValue(String value) {
-        for (int i = 0, n = mUnfilteredEntryValues.length; i < n; ++i) {
-            if (CameraUtil.equals(mUnfilteredEntryValues[i], value)) return i;
-        }
-        return -1;
-    }
-
     public int getCurrentIndex() {
         return findIndexOfValue(getValue());
     }
 
-    public int getCurrentUnfilteredIndex() {
-        return findUnfilteredIndexOfValue(getValue());
-    }
-
     public String getEntry() {
         return mEntries[findIndexOfValue(getValue())].toString();
     }
@@ -193,49 +180,29 @@ public class ListPreference extends CameraPreference {
     public void filterUnsupported(List<String> supported) {
         ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
-        ArrayList<CharSequence> labels = null;
-        if (mLabels.length > 0) {
-            labels = new ArrayList<CharSequence>();
-        }
         for (int i = 0, len = mEntryValues.length; i < len; i++) {
             if (supported.indexOf(mEntryValues[i].toString()) >= 0) {
                 entries.add(mEntries[i]);
                 entryValues.add(mEntryValues[i]);
-                if (labels != null) {
-                    labels.add(mLabels[i]);
-                }
             }
         }
         int size = entries.size();
         mEntries = entries.toArray(new CharSequence[size]);
         mEntryValues = entryValues.toArray(new CharSequence[size]);
-        if (labels != null) {
-            mLabels = labels.toArray(new CharSequence[size]);
-        }
     }
 
     public void filterDuplicated() {
         ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
-        ArrayList<CharSequence> labels = null;
-        if (mLabels.length > 0) {
-            labels = new ArrayList<CharSequence>();
-        }
         for (int i = 0, len = mEntryValues.length; i < len; i++) {
             if (!entries.contains(mEntries[i])) {
                 entries.add(mEntries[i]);
                 entryValues.add(mEntryValues[i]);
-                if (labels != null) {
-                    labels.add(mLabels[i]);
-                }
             }
         }
         int size = entries.size();
         mEntries = entries.toArray(new CharSequence[size]);
         mEntryValues = entryValues.toArray(new CharSequence[size]);
-        if (labels != null) {
-            mLabels = labels.toArray(new CharSequence[size]);
-        }
     }
 
     public void print() {
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 7212d7a46..80e6b13d4 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -622,7 +622,7 @@ public class PhotoUI implements PieListener,
         int wbIndex = 2;
         ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE);
         if (pref != null) {
-            wbIndex = pref.getCurrentUnfilteredIndex();
+            wbIndex = pref.getCurrentIndex();
         }
         mOnScreenIndicators.updateWBIndicator(wbIndex);
         boolean location = RecordLocationPreference.get(