am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service...

* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
  User to confirm credentials if an accessibility service changes encryption.

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 51b5ca9,71b5862..b10cefd
--- 1/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
--- 2/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@@ -65,9 -75,14 +72,15 @@@ public class ToggleAccessibilityService
      private int mShownDialogId;
  
      @Override
+     public void onCreate(Bundle savedInstanceState) {
+         super.onCreate(savedInstanceState);
+         mLockPatternUtils = new LockPatternUtils(getActivity());
+     }
+ 
+     @Override
      public void onResume() {
          mSettingsContentObserver.register(getContentResolver());
 +        updateSwitchBarToggleSwitch();
          super.onResume();
      }