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

Merge "Fixing bug 2486048 - Disabling Accessibility does not disable Accessibility services check boxes"

Browse Source
This commit is contained in:
Amith Yamasani
2010-03-10 12:33:03 -08:00
committed by Android (Google) Code Review
parent d2b8efa494 f7adf2bd07
commit 7210caf802
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,8 @@ public class AccessibilitySettings extends PreferenceActivity {
if (!accessibilityServices.isEmpty()) { if (!accessibilityServices.isEmpty()) {
if (serviceState == 1) { if (serviceState == 1) {
mToggleCheckBox.setChecked(true); mToggleCheckBox.setChecked(true);
} else {
setAccessibilityServicePreferencesState(false);
} }
mToggleCheckBox.setEnabled(true); mToggleCheckBox.setEnabled(true);
} else { } else {
@@ -127,6 +129,24 @@ public class AccessibilitySettings extends PreferenceActivity {
persistEnabledAccessibilityServices(); 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);
}
}
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
final String key = preference.getKey(); final String key = preference.getKey();
@@ -150,6 +170,7 @@ public class AccessibilitySettings extends PreferenceActivity {
if (preference.isChecked()) { if (preference.isChecked()) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 1); Settings.Secure.ACCESSIBILITY_ENABLED, 1);
setAccessibilityServicePreferencesState(true);
} else { } else {
final CheckBoxPreference checkBoxPreference = preference; final CheckBoxPreference checkBoxPreference = preference;
AlertDialog dialog = (new AlertDialog.Builder(this)) AlertDialog dialog = (new AlertDialog.Builder(this))
@@ -162,6 +183,7 @@ public class AccessibilitySettings extends PreferenceActivity {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 0); Settings.Secure.ACCESSIBILITY_ENABLED, 0);
setAccessibilityServicePreferencesState(false);
} }
}) })
.setNegativeButton(android.R.string.cancel, .setNegativeButton(android.R.string.cancel,