Merge "Framework: fixed bug in multiselectlistpreference." (6c079b68) · Commits · e / os / android_frameworks_base

core/java/android/preference/MultiSelectListPreference.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -169,9 +169,9 @@ public class MultiSelectListPreference extends DialogPreference {
		new DialogInterface.OnMultiChoiceClickListener() {
		public void onClick(DialogInterface dialog, int which, boolean isChecked) {
		if (isChecked) {
		mPreferenceChanged \|= mNewValues.add(mEntries[which].toString());
		mPreferenceChanged \|= mNewValues.add(mEntryValues[which].toString());
		} else {
		mPreferenceChanged \|= mNewValues.remove(mEntries[which].toString());
		mPreferenceChanged \|= mNewValues.remove(mEntryValues[which].toString());
		}
		}
		});
		@@ -180,7 +180,7 @@ public class MultiSelectListPreference extends DialogPreference {
		}

		private boolean[] getSelectedItems() {
		final CharSequence[] entries = mEntries;
		final CharSequence[] entries = mEntryValues;
		final int entryCount = entries.length;
		final Set<String> values = mValues;
		boolean[] result = new boolean[entryCount];