Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev (1501da4b) · Commits · e / os / android_frameworks_base

core/java/android/view/AccessibilityInteractionController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -758,7 +758,10 @@ final class AccessibilityInteractionController {
		Rect visibleDisplayFrame = mTempRect2;
		visibleDisplayFrame.set(0, 0, displayWidth, displayHeight);

		visibleWinFrame.intersect(visibleDisplayFrame);
		if (!visibleWinFrame.intersect(visibleDisplayFrame)) {
		// If there's no intersection with display, set visibleWinFrame empty.
		visibleDisplayFrame.setEmpty();
		}

		if (!visibleWinFrame.intersects(boundsInScreen.left, boundsInScreen.top,
		boundsInScreen.right, boundsInScreen.bottom)) {

+10 −2

Original line number	Diff line number	Diff line
		@@ -5225,12 +5225,20 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		descendant.mTop - descendant.mScrollY);
		if (clipToBounds) {
		View p = (View) theParent;
		rect.intersect(0, 0, p.mRight - p.mLeft, p.mBottom - p.mTop);
		boolean intersected = rect.intersect(0, 0, p.mRight - p.mLeft,
		p.mBottom - p.mTop);
		if (!intersected) {
		rect.setEmpty();
		}
		}
		} else {
		if (clipToBounds) {
		View p = (View) theParent;
		rect.intersect(0, 0, p.mRight - p.mLeft, p.mBottom - p.mTop);
		boolean intersected = rect.intersect(0, 0, p.mRight - p.mLeft,
		p.mBottom - p.mTop);
		if (!intersected) {
		rect.setEmpty();
		}
		}
		rect.offset(descendant.mScrollX - descendant.mLeft,
		descendant.mScrollY - descendant.mTop);

+5 −1

Original line number	Diff line number	Diff line
		@@ -2791,7 +2791,11 @@ public final class ViewRootImpl implements ViewParent,
		final AttachInfo attachInfo = mAttachInfo;
		bounds.offset(0, attachInfo.mViewRootImpl.mScrollY);
		bounds.offset(-attachInfo.mWindowLeft, -attachInfo.mWindowTop);
		bounds.intersect(0, 0, attachInfo.mViewRootImpl.mWidth, attachInfo.mViewRootImpl.mHeight);
		if (!bounds.intersect(0, 0, attachInfo.mViewRootImpl.mWidth,
		attachInfo.mViewRootImpl.mHeight)) {
		// If no intersection, set bounds to empty.
		bounds.setEmpty();
		}
		return !bounds.isEmpty();
		}