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

Merge "3328848 Script injection property is enabled when accessibility is disabled" into honeycomb

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-01-07 09:25:48 -08:00
committed by Android (Google) Code Review
parent 586fa0264c c04e3480aa
commit 994acfe348
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
if (serviceState == 1) { if (serviceState == 1) {
mToggleAccessibilityCheckBox.setChecked(true); mToggleAccessibilityCheckBox.setChecked(true);
if (savedInstanceState != null) { if (savedInstanceState != null) {
restoreInstanceStrate(savedInstanceState); restoreInstanceState(savedInstanceState);
} }
} else { } else {
setAccessibilityServicePreferencesState(false); setAccessibilityServicePreferencesState(false);
@@ -200,7 +200,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
/** /**
* Restores the instance state from <code>savedInstanceState</code>. * Restores the instance state from <code>savedInstanceState</code>.
*/ */
private void restoreInstanceStrate(Bundle savedInstanceState) { private void restoreInstanceState(Bundle savedInstanceState) {
String key = savedInstanceState.getString(KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX); String key = savedInstanceState.getString(KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX);
if (key != null) { if (key != null) {
Preference preference = findPreference(key); Preference preference = findPreference(key);
@@ -230,6 +230,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
Preference pref = mAccessibilityServicesCategory.getPreference(i); Preference pref = mAccessibilityServicesCategory.getPreference(i);
pref.setEnabled(isEnabled); pref.setEnabled(isEnabled);
} }
mToggleScriptInjectionCheckBox.setEnabled(isEnabled);
} }
@Override @Override