summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-04-27 11:45:38 -0700
committerAdam Powell <adamp@google.com>2010-04-27 11:45:38 -0700
commit7bcf5172aa454967ee05902fb97d867ef57e0aa8 (patch)
tree8eee56ace0928f238cc9376e4ecf164611057605 /core/java
parent2e4b98dcd88f14fdb35e46236ec916493c570f28 (diff)
downloadframeworks_base-7bcf5172aa454967ee05902fb97d867ef57e0aa8.zip
frameworks_base-7bcf5172aa454967ee05902fb97d867ef57e0aa8.tar.gz
frameworks_base-7bcf5172aa454967ee05902fb97d867ef57e0aa8.tar.bz2
Fix a WebView scrolling regression - bug 2633572.
Update mLastTouchX/Y on every drag. This prevents the creation of dead zones that the user has to drag back out of at the edges of a document. Change-Id: I348d96dfd3907dba7c6ddd86b678329d65063ba9
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 4 insertions, 0 deletions
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 @@ 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;