Merge "Fix a WebView scrolling regression - bug 2633572." into froyo

2010-04-27 12:05:40 -07:00
parent 6ce78924eb 7bcf5172aa
commit 2ea21a84ef
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -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;