diff options
| author | John Reck <jreck@google.com> | 2012-08-20 17:37:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 17:37:20 -0700 |
| commit | 003caf9e43b46a60b08c5a98aae17fc9f1b6e308 (patch) | |
| tree | d37fb689fd0d9fd5f52bbcc23975ed1c547cb9f2 | |
| parent | e572f5e2aff01503f1e31464aeb01c058607b8f3 (diff) | |
| parent | d87fd2e136b69c0d3f0a5c9d7c923e604d0c576c (diff) | |
| download | frameworks_base-003caf9e43b46a60b08c5a98aae17fc9f1b6e308.zip frameworks_base-003caf9e43b46a60b08c5a98aae17fc9f1b6e308.tar.gz frameworks_base-003caf9e43b46a60b08c5a98aae17fc9f1b6e308.tar.bz2 | |
am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev
* commit 'd87fd2e136b69c0d3f0a5c9d7c923e604d0c576c':
Support scrolling layers with the mousewheel
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 52048db..9df4852 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -6448,9 +6448,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mWebViewPrivate.getVerticalScrollFactor()); final int hdelta = (int) (hscroll * mWebViewPrivate.getHorizontalScrollFactor()); - if (pinScrollBy(hdelta, vdelta, false, 0)) { - return true; - } + + abortAnimation(); + int oldTouchMode = mTouchMode; + startScrollingLayer(event.getX(), event.getY()); + doDrag(hdelta, vdelta); + mTouchMode = oldTouchMode; + return true; } } } |