Merge "Revert "Stop dispatching TYPE_VIEW_SELECTED a11y event on child ..."" (dfe14efb) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+5 −11

Original line number	Diff line number	Diff line
		@@ -25829,10 +25829,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @param selected true if the view must be selected, false otherwise
		*/
		public void setSelected(boolean selected) {
		setSelected(selected, true);
		}

		void setSelected(boolean selected, boolean sendAccessibilityEvent) {
		//noinspection DoubleNegation
		if (((mPrivateFlags & PFLAG_SELECTED) != 0) != selected) {
		mPrivateFlags = (mPrivateFlags & ~PFLAG_SELECTED) \| (selected ? PFLAG_SELECTED : 0);
		@@ -25840,7 +25836,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidate(true);
		refreshDrawableState();
		dispatchSetSelected(selected);
		if (sendAccessibilityEvent) {
		if (selected) {
		sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
		} else {
		@@ -25849,7 +25844,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}
		}
		}

		/**
		* Dispatch setSelected to all of this View's children.

+1 −1

Original line number	Diff line number	Diff line
		@@ -4631,7 +4631,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		final View[] children = mChildren;
		final int count = mChildrenCount;
		for (int i = 0; i < count; i++) {
		children[i].setSelected(selected, false);
		children[i].setSelected(selected);
		}
		}