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

am 39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0

Browse Source 
* commit '39b8eb6ce545287cd77bea465d280772669c68d1':
  Accessibility service toggle setting state not preserved on screen rotation.
This commit is contained in:
Svetoslav Ganov
2011-10-18 13:16:59 -07:00
committed by Android Git Automerger
parent c95b4591eb 39b8eb6ce5
commit abda8c0fba
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/AccessibilitySettings.java
View File

@@ -807,11 +807,13 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
case DialogInterface.BUTTON_POSITIVE: case DialogInterface.BUTTON_POSITIVE:
checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING); checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
mToggleSwitch.setCheckedInternal(checked); mToggleSwitch.setCheckedInternal(checked);
getArguments().putBoolean(EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked); onPreferenceToggled(mPreferenceKey, checked);
break; break;
case DialogInterface.BUTTON_NEGATIVE: case DialogInterface.BUTTON_NEGATIVE:
checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING); checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
mToggleSwitch.setCheckedInternal(checked); mToggleSwitch.setCheckedInternal(checked);
getArguments().putBoolean(EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked); onPreferenceToggled(mPreferenceKey, checked);
break; break;
default: default:
@@ -827,6 +829,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
if (checked) { if (checked) {
if (!TextUtils.isEmpty(mEnableWarningMessage)) { if (!TextUtils.isEmpty(mEnableWarningMessage)) {
toggleSwitch.setCheckedInternal(false); toggleSwitch.setCheckedInternal(false);
getArguments().putBoolean(EXTRA_CHECKED, false);
showDialog(DIALOG_ID_ENABLE_WARNING); showDialog(DIALOG_ID_ENABLE_WARNING);
return true; return true;
} }
@@ -834,6 +837,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} else { } else {
if (!TextUtils.isEmpty(mDisableWarningMessage)) { if (!TextUtils.isEmpty(mDisableWarningMessage)) {
toggleSwitch.setCheckedInternal(true); toggleSwitch.setCheckedInternal(true);
getArguments().putBoolean(EXTRA_CHECKED, true);
showDialog(DIALOG_ID_DISABLE_WARNING); showDialog(DIALOG_ID_DISABLE_WARNING);
return true; return true;
} }