Merge "Reduce extra a11y events when alpha changes." into nyc-mr1-dev (41e185e7) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -12359,6 +12359,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		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 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mPrivateFlags &= ~PFLAG_ALPHA_SET;
		invalidateViewProperty(true, false);
		mRenderNode.setAlpha(getFinalAlpha());
		notifyViewAccessibilityStateChangedIfNeeded(
		AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
		}
		}
		}