diff options
| author | Adam Powell <adamp@google.com> | 2010-04-27 12:08:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-27 12:08:01 -0700 |
| commit | b40cfc162fc473aece63f449eaa1dd643d24b9c0 (patch) | |
| tree | 18a7203e130bbb10d2bf65bd10558fed0c3324fb | |
| parent | b2dbae879d32ce654528ab550c0dd017b67d7b08 (diff) | |
| parent | 2ea21a84ef81849153f30bbea213acd5be110c08 (diff) | |
| download | frameworks_base-b40cfc162fc473aece63f449eaa1dd643d24b9c0.zip frameworks_base-b40cfc162fc473aece63f449eaa1dd643d24b9c0.tar.gz frameworks_base-b40cfc162fc473aece63f449eaa1dd643d24b9c0.tar.bz2 | |
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.
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
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; |