Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abda8c0f authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 39b8eb6c: Merge "Accessibility service toggle setting state not preserved... 

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

* commit '39b8eb6c':
  Accessibility service toggle setting state not preserved on screen rotation.
parents c95b4591 39b8eb6c

src/com/android/settings/AccessibilitySettings.java

+4 −0
Original line number Diff line number Diff line
@@ -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;

                        }