commit 5037dea4aa3f04ff1878ddbdbd7cf4d215c426e3
author Scott Kennedy <skennedy@google.com> Fri Jan 30 12:12:13 2015 -0800
committer Scott Kennedy <skennedy@google.com> Fri Jan 30 12:12:13 2015 -0800
tree 9635802e72f47aa5d52e5f10998ab27cf421f983
parent 38551b3bb10a24e8949d776df2d44cd6c7f4f8e7

Check if accessibility is enabled before each use

The enabled status can change between layout calls.

Bug: 19180194
Change-Id: Ia7acbd7f432a85f20b9a344d4c76756407abf8b1

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 dd83360..4855d64 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();
 
@@ -549,7 +539,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(