diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-09-12 15:42:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-09-12 15:42:35 +0000 |
| commit | 29f555f41d74f86a81bf9c8642f6e4124ccd9575 (patch) | |
| tree | 8c408e52941d6b370826be92c68f480143b85cf4 | |
| parent | 446a47c766a32604ba35f3110b781cf34f928c1d (diff) | |
| parent | 05549979ea6eb138196700fae8e11c1cb731ff94 (diff) | |
| download | android_packages_apps_Gallery2-29f555f41d74f86a81bf9c8642f6e4124ccd9575.tar.gz android_packages_apps_Gallery2-29f555f41d74f86a81bf9c8642f6e4124ccd9575.tar.bz2 android_packages_apps_Gallery2-29f555f41d74f86a81bf9c8642f6e4124ccd9575.zip | |
Merge "Gallery2: fix labels for scene modes" into cm-10.2
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index 38866de9d..bce90ccf5 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -168,15 +168,20 @@ 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 = 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 (mLabels != null && mLabels.length > 0) { + labels.add(mLabels[i]); + } } } int size = entries.size(); mEntries = entries.toArray(new CharSequence[size]); mEntryValues = entryValues.toArray(new CharSequence[size]); + mLabels = labels.toArray(new CharSequence[size]); } public void filterDuplicated() { |