PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow restore instance before setValues() in ListDialogPreference"

Browse Source
This commit is contained in:
Alan Viverette
2014-05-12 19:34:53 +00:00
committed by Android (Google) Code Review
parent ac463a0dbf 2e1bf8a478
commit 8ebb153272
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/accessibility/ListDialogPreference.java
View File

@@ -82,6 +82,10 @@ public abstract class ListDialogPreference extends DialogPreference {
*/
public void setValues(int[] values) {
mEntryValues = values;
if (mValueSet && mValueIndex == AbsListView.INVALID_POSITION) {
mValueIndex = getIndexForValue(mValue);
}
}
/**
@@ -172,10 +176,12 @@ public abstract class ListDialogPreference extends DialogPreference {
*/
protected int getIndexForValue(int value) {
final int[] values = mEntryValues;
final int count = values.length;
for (int i = 0; i < count; i++) {
if (values[i] == value) {
return i;
if (values != null) {
final int count = values.length;
for (int i = 0; i < count; i++) {
if (values[i] == value) {
return i;
}
}
}