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

Fix CustomListPreference click handling

Browse Source 
Bug: 26187611
Change-Id: I6293d5577b4f770e2dfe94bae53fa9da0822cefc
This commit is contained in:
Jason Monk
2015-12-14 16:39:45 -05:00
parent ffb4535d3a
commit 9cbf325589
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/CustomListPreference.java
View File

@@ -44,6 +44,8 @@ public class CustomListPreference extends ListPreference{
public static class CustomListPreferenceDialogFragment extends ListPreferenceDialogFragment { public static class CustomListPreferenceDialogFragment extends ListPreferenceDialogFragment {
private int mClickedDialogEntryIndex;
public static ListPreferenceDialogFragment newInstance(String key) { public static ListPreferenceDialogFragment newInstance(String key) {
final ListPreferenceDialogFragment fragment = new CustomListPreferenceDialogFragment(); final ListPreferenceDialogFragment fragment = new CustomListPreferenceDialogFragment();
final Bundle b = new Bundle(1); final Bundle b = new Bundle(1);
@@ -59,12 +61,35 @@ public class CustomListPreference extends ListPreference{
@Override @Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) { protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
super.onPrepareDialogBuilder(builder); super.onPrepareDialogBuilder(builder);
getCustomizablePreference().onPrepareDialogBuilder(builder, this); mClickedDialogEntryIndex = getCustomizablePreference()
.findIndexOfValue(getCustomizablePreference().getValue());
getCustomizablePreference().onPrepareDialogBuilder(builder,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mClickedDialogEntryIndex = which;
/*
* Clicking on an item simulates the positive button
* click, and dismisses the dialog.
*/
CustomListPreferenceDialogFragment.this.onClick(dialog,
DialogInterface.BUTTON_POSITIVE);
dialog.dismiss();
}
});
} }
@Override @Override
public void onDialogClosed(boolean positiveResult) { public void onDialogClosed(boolean positiveResult) {
getCustomizablePreference().onDialogClosed(positiveResult); getCustomizablePreference().onDialogClosed(positiveResult);
final ListPreference preference = getCustomizablePreference();
if (positiveResult && mClickedDialogEntryIndex >= 0 &&
preference.getEntryValues() != null) {
String value = preference.getEntryValues()[mClickedDialogEntryIndex].toString();
if (preference.callChangeListener(value)) {
preference.setValue(value);
}
}
} }
} }
} }