Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling."

Luca Zanolin · Android (Google) Code Review · commit af43add388cd · 2011-09-30T01:01:35.000-07:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -9480,8 +9480,8 @@ public boolean isVisible(int positionX, int positionY) {
                 return false;
             }
 
-            int posX = mPositionX + positionX;
-            int posY = mPositionY + positionY;
+            int posX = mPositionX + positionX - getScrollX();
+            int posY = mPositionY + positionY - getScrollY();
 
             // Offset by 1 to take into account 0.5 and int rounding around getPrimaryHorizontal.
             return posX >= clip.left - 1 && posX <= clip.right + 1 &&

Original file line number	Diff line number	Diff line change
`@@ -9480,8 +9480,8 @@ public boolean isVisible(int positionX, int positionY) {`
`9480`	`9480`	`return false;`
`9481`	`9481`	`}`
`9482`	`9482`
`9483`		`- int posX = mPositionX + positionX;`
`9484`		`- int posY = mPositionY + positionY;`
	`9483`	`+ int posX = mPositionX + positionX - getScrollX();`
	`9484`	`+ int posY = mPositionY + positionY - getScrollY();`
`9485`	`9485`
`9486`	`9486`	`// Offset by 1 to take into account 0.5 and int rounding around getPrimaryHorizontal.`
`9487`	`9487`	`return posX >= clip.left - 1 && posX <= clip.right + 1 &&`