am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit 'a883dbba7194b19c14c4fff83f94ee852c7bb798':
  Update accessibility service toggle switch when resuming.

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

@@ -56,10 +56,7 @@ public class ToggleAccessibilityServicePreferenceFragment
             new SettingsContentObserver(new Handler()) {
             @Override
                 public void onChange(boolean selfChange, Uri uri) {
-                    String settingValue = Settings.Secure.getString(getContentResolver(),
-                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());
-                    mSwitchBar.setCheckedInternal(enabled);
+                    updateSwitchBarToggleSwitch();
                 }
             };
 
@@ -70,6 +67,7 @@ public class ToggleAccessibilityServicePreferenceFragment
     @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
+        updateSwitchBarToggleSwitch();
         super.onResume();
     }
 
@@ -195,6 +193,13 @@ public class ToggleAccessibilityServicePreferenceFragment
         }
     }
 
+    private void updateSwitchBarToggleSwitch() {
+        String settingValue = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        final boolean checked = settingValue.contains(mComponentName.flattenToString());
+        mSwitchBar.setCheckedInternal(checked);
+    }
+
     private View createEnableDialogContentView(AccessibilityServiceInfo info) {
         LayoutInflater inflater = (LayoutInflater) getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);