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

Commit 0e0ce11e authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Stay in layer scroll if nothing to scroll" into jb-dev

parents 6a5f9f6d 919c89e2

core/java/android/webkit/WebViewClassic.java

+3 −2
Original line number Diff line number Diff line
@@ -6224,8 +6224,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
                final int resultY = Math.max(0,

                        Math.min(mScrollingLayerRect.top + contentY, maxY));



                if (resultX != mScrollingLayerRect.left ||

                        resultY != mScrollingLayerRect.top) {

                if (resultX != mScrollingLayerRect.left

                        || resultY != mScrollingLayerRect.top

                        || (contentX | contentY) == 0) {

                    // In case we switched to dragging the page.

                    mTouchMode = TOUCH_DRAG_LAYER_MODE;

                    deltaX = contentX;