am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo
Merge commit '2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp
* commit '2ea21a84ef81849153f30bbea213acd5be110c08':
Fix a WebView scrolling regression - bug 2633572.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6f4c6ff..6b316ce 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4814,6 +4814,8 @@
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 @@
} else {
// keep the scrollbar on the screen even there is no
// scroll
+ mLastTouchX = x;
+ mLastTouchY = y;
keepScrollBarsVisible = true;
}
mLastTouchTime = eventTime;