diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-01-07 09:25:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-07 09:25:48 -0800 |
| commit | 994acfe3485d9a170bb8886bfa672bfc3ba13ae1 (patch) | |
| tree | 7da94b15908765f5e76e8fcd7712ecf5e9fe3223 /src/com | |
| parent | 586fa0264cacb216f04f003770562c77fb7dd646 (diff) | |
| parent | c04e3480aa3cc11a1625cd59093e8b3e4b944a4d (diff) | |
| download | packages_apps_Settings-994acfe3485d9a170bb8886bfa672bfc3ba13ae1.tar.gz packages_apps_Settings-994acfe3485d9a170bb8886bfa672bfc3ba13ae1.tar.bz2 packages_apps_Settings-994acfe3485d9a170bb8886bfa672bfc3ba13ae1.zip | |
Merge "3328848 Script injection property is enabled when accessibility is disabled" into honeycomb
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/AccessibilitySettings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index 6cc5508c1..cec62b003 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -161,7 +161,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements if (serviceState == 1) { mToggleAccessibilityCheckBox.setChecked(true); if (savedInstanceState != null) { - restoreInstanceStrate(savedInstanceState); + restoreInstanceState(savedInstanceState); } } else { setAccessibilityServicePreferencesState(false); @@ -200,7 +200,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements /** * 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); if (key != null) { Preference preference = findPreference(key); @@ -230,6 +230,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements Preference pref = mAccessibilityServicesCategory.getPreference(i); pref.setEnabled(isEnabled); } + + mToggleScriptInjectionCheckBox.setEnabled(isEnabled); } @Override |