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

Commit c9a39081 authored by Victoria Lease's avatar Victoria Lease Committed by Android (Google) Code Review
Browse files

Merge "finalise scrolling before checking scroll position"

parents 9776ed7b 3beeb1c6

core/java/android/webkit/WebViewClassic.java

+1 −1
Original line number Diff line number Diff line
@@ -3896,6 +3896,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
    // helper to pin the scrollTo parameters (already in view coordinates)

    // returns true if the scroll was changed

    private boolean pinScrollTo(int x, int y, boolean animate, int animationDuration) {

        abortAnimation();

        x = pinLocX(x);

        y = pinLocY(y);

        int dx = x - getScrollX();
@@ -3904,7 +3905,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        if ((dx | dy) == 0) {

            return false;

        }

        abortAnimation();

        if (animate) {

            //        Log.d(LOGTAG, "startScroll: " + dx + " " + dy);

            mScroller.startScroll(getScrollX(), getScrollY(), dx, dy,