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

Commit 067521f9 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 

Merge commit 'b40cfc16' into kraken

* commit 'b40cfc16':
  Fix a WebView scrolling regression - bug 2633572.
parents 018579c4 b40cfc16

core/java/android/webkit/WebView.java

+4 −0
Original line number Diff line number Diff line
@@ -4814,6 +4814,8 @@ public class WebView extends AbsoluteLayout 
                boolean done = false;

                boolean keepScrollBarsVisible = false;

                if (Math.abs(fDeltaX) < 1.0f && Math.abs(fDeltaY) < 1.0f) {

                    mLastTouchX = x;

                    mLastTouchY = y;

                    keepScrollBarsVisible = done = true;

                } else {

                    if (mSnapScrollMode == SNAP_X || mSnapScrollMode == SNAP_Y) {
@@ -4865,6 +4867,8 @@ public class WebView extends AbsoluteLayout 
                    } else {

                        // keep the scrollbar on the screen even there is no

                        // scroll

                        mLastTouchX = x;

                        mLastTouchY = y;

                        keepScrollBarsVisible = true;

                    }

                    mLastTouchTime = eventTime;