commit 41e185e73b96f6b1025eb2c920bebea32805713d
author Phil Weaver <pweaver@google.com> Tue Aug 02 16:54:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 16:54:43 2016 +0000
tree 7c7ce0d706316b56e89f8d2946ed32b400414b0e
parent b008ff14ac7c0cc206ebeb51998637fb51b13e8f
parent 9937f81ac653ed08032c547147a0934422540a45

Merge "Reduce extra a11y events when alpha changes." into nyc-mr1-dev

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index dab494b..69f1747 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12359,6 +12359,10 @@
     public void setAlpha(@FloatRange(from=0.0, to=1.0) float alpha) {
         ensureTransformationInfo();
         if (mTransformationInfo.mAlpha != alpha) {
+            // Report visibility changes, which can affect children, to accessibility
+            if ((alpha == 0) ^ (mTransformationInfo.mAlpha == 0)) {
+                notifySubtreeAccessibilityStateChangedIfNeeded();
+            }
             mTransformationInfo.mAlpha = alpha;
             if (onSetAlpha((int) (alpha * 255))) {
                 mPrivateFlags |= PFLAG_ALPHA_SET;
@@ -12369,8 +12373,6 @@
                 mPrivateFlags &= ~PFLAG_ALPHA_SET;
                 invalidateViewProperty(true, false);
                 mRenderNode.setAlpha(getFinalAlpha());
-                notifyViewAccessibilityStateChangedIfNeeded(
-                        AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
             }
         }
     }