commit 08c72ba331d181efa0153964292ebf08ef3e261d
author Scott Kennedy <skennedy@google.com> Fri Jan 30 21:14:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 21:14:08 2015 +0000
tree 825798773379da80c1efde5e09f265f1a1bf5f30
parent 970a85caa1f6503ec55b88b8c0f477b12ea3fae9
parent 5037dea4aa3f04ff1878ddbdbd7cf4d215c426e3

am 5037dea4: Check if accessibility is enabled before each use

* commit '5037dea4aa3f04ff1878ddbdbd7cf4d215c426e3':
  Check if accessibility is enabled before each use

src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index ae27c32..4584e58 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -192,7 +192,6 @@
     private ReplacementDrawableSpan mMoreChip;
     private TextView mMoreItem;
 
-    private boolean mIsAccessibilityOn;
     private int mCurrentSuggestionCount;
 
     // VisibleForTesting
@@ -316,15 +315,6 @@
         });
     }
 
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-
-        final AccessibilityManager accessibilityManager =
-                (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
-        mIsAccessibilityOn = accessibilityManager.isEnabled();
-    }
-
     private int calculateTextHeight() {
         final TextPaint paint = getPaint();
 
@@ -548,7 +538,11 @@
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void announceForAccessibilityCompat(String text) {
-        if (mIsAccessibilityOn && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+        final AccessibilityManager accessibilityManager =
+                (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
+        final boolean isAccessibilityOn = accessibilityManager.isEnabled();
+
+        if (isAccessibilityOn && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             final ViewParent parent = getParent();
             if (parent != null) {
                 AccessibilityEvent event = AccessibilityEvent.obtain(