Merge "Updates event source to important parent only when events are merged" into main (6892184b) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -11550,15 +11550,6 @@ public final class ViewRootImpl implements ViewParent,
		event.setContentChangeTypes(mChangeTypes);
		if (mAction.isPresent()) event.setAction(mAction.getAsInt());
		if (AccessibilityEvent.DEBUG_ORIGIN) event.originStackTrace = mOrigin;

		if (fixMergedContentChangeEvent()) {
		if ((mChangeTypes & AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE) != 0) {
		final View importantParent = source.getSelfOrParentImportantForA11y();
		if (importantParent != null) {
		source = importantParent;
		}
		}
		}
		source.sendAccessibilityEventUnchecked(event);
		} else {
		mLastEventTimeMillis = 0;
		@@ -11595,6 +11586,9 @@ public final class ViewRootImpl implements ViewParent,
		if (mSource != null) {
		if (fixMergedContentChangeEvent()) {
		View newSource = getCommonPredecessor(mSource, source);
		if (newSource != null) {
		newSource = newSource.getSelfOrParentImportantForA11y();
		}
		if (newSource == null) {
		// If there is no common predecessor, then mSource points to
		// a removed view, hence in this case always prefer the source.