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

Commit 6f80c446 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Fix: TextView cannot be scrolled."

parents 1a0e355c cb4a2bb5

core/java/android/text/method/Touch.java

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ public class Touch { 
                    ds[0].mX = event.getX();

                    ds[0].mY = event.getY();



                    int nx = widget.getScrollX() + (int) dx;

                    int ny = widget.getScrollY() + (int) dy;



                    int padding = widget.getTotalPaddingTop() + widget.getTotalPaddingBottom();
@@ -161,6 +162,8 @@ public class Touch { 
                    int oldX = widget.getScrollX();

                    int oldY = widget.getScrollY();



                    scrollTo(widget, layout, nx, ny);



                    // If we actually scrolled, then cancel the up action.

                    if (oldX != widget.getScrollX() || oldY != widget.getScrollY()) {

                        widget.cancelLongPress();