Merge "Fixing bug 2455152 - Enabled accessibility services are disabled upon restarting accessibility"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 1d6db20..276a22f 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -105,8 +105,6 @@
if (!accessibilityServices.isEmpty()) {
if (serviceState == 1) {
mToggleCheckBox.setChecked(true);
- } else {
- setAccessibilityServicePreferencesState(false);
}
mToggleCheckBox.setEnabled(true);
} else {
@@ -114,7 +112,6 @@
// no service and accessibility is enabled => disable
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 0);
- setAccessibilityServicePreferencesState(false);
}
mToggleCheckBox.setEnabled(false);
// Notify user that they do not have any accessibility apps
@@ -130,26 +127,6 @@
persistEnabledAccessibilityServices();
}
- /**
- * Sets the state of the preferences for enabling/disabling AccessibilityServices.
- *
- * @param isEnabled If to enable or disable the preferences.
- */
- private void setAccessibilityServicePreferencesState(boolean isEnabled) {
- if (mAccessibilityServicesCategory == null) {
- return;
- }
-
- int count = mAccessibilityServicesCategory.getPreferenceCount();
- for (int i = 0; i < count; i++) {
- Preference pref = mAccessibilityServicesCategory.getPreference(i);
- pref.setEnabled(isEnabled);
- if (!isEnabled){
- ((CheckBoxPreference) pref).setChecked(false);
- }
- }
- }
-
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
final String key = preference.getKey();
@@ -173,7 +150,6 @@
if (preference.isChecked()) {
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 1);
- setAccessibilityServicePreferencesState(true);
} else {
final CheckBoxPreference checkBoxPreference = preference;
AlertDialog dialog = (new AlertDialog.Builder(this))
@@ -186,7 +162,6 @@
public void onClick(DialogInterface dialog, int which) {
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 0);
- setAccessibilityServicePreferencesState(false);
}
})
.setNegativeButton(android.R.string.cancel,