Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
This commit is contained in:
committed by
Android (Google) Code Review
commit
39b8eb6ce5
@@ -807,11 +807,13 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
case DialogInterface.BUTTON_POSITIVE:
|
||||
checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
|
||||
mToggleSwitch.setCheckedInternal(checked);
|
||||
getArguments().putBoolean(EXTRA_CHECKED, checked);
|
||||
onPreferenceToggled(mPreferenceKey, checked);
|
||||
break;
|
||||
case DialogInterface.BUTTON_NEGATIVE:
|
||||
checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
|
||||
mToggleSwitch.setCheckedInternal(checked);
|
||||
getArguments().putBoolean(EXTRA_CHECKED, checked);
|
||||
onPreferenceToggled(mPreferenceKey, checked);
|
||||
break;
|
||||
default:
|
||||
@@ -827,6 +829,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
if (checked) {
|
||||
if (!TextUtils.isEmpty(mEnableWarningMessage)) {
|
||||
toggleSwitch.setCheckedInternal(false);
|
||||
getArguments().putBoolean(EXTRA_CHECKED, false);
|
||||
showDialog(DIALOG_ID_ENABLE_WARNING);
|
||||
return true;
|
||||
}
|
||||
@@ -834,6 +837,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
} else {
|
||||
if (!TextUtils.isEmpty(mDisableWarningMessage)) {
|
||||
toggleSwitch.setCheckedInternal(true);
|
||||
getArguments().putBoolean(EXTRA_CHECKED, true);
|
||||
showDialog(DIALOG_ID_DISABLE_WARNING);
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user