Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af43add3 authored by Luca Zanolin's avatar Luca Zanolin Committed by Android (Google) Code Review
Browse files

Merge "The x and y position of the pop-up where not calculated correctly when... 

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

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -9480,8 +9480,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                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 &&