Merge "Make a11y settings display consistent" into nyc-mr1-dev

2016-09-13 01:07:05 +00:00
parent ed765a4817 99a66b5416
commit 9d6bce3667
1 changed files with 2 additions and 4 deletions
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -203,10 +203,8 @@ public class ToggleAccessibilityServicePreferenceFragment
    }

    private void updateSwitchBarToggleSwitch() {
-        final String settingValue = Settings.Secure.getString(getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        final boolean checked = settingValue != null
-                && settingValue.contains(mComponentName.flattenToString());
+        final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getActivity())
+                .contains(mComponentName);
        mSwitchBar.setCheckedInternal(checked);
    }