diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-06-06 20:29:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 20:29:08 -0700 |
| commit | 277bfd7cdd889e4f59e57925b90d1899f7312c4e (patch) | |
| tree | 5cbc89537c6a228e3e2c39c11b51562cadcc4683 /core | |
| parent | fc3fa5dc1045a8f25fc1982443e05873edf028df (diff) | |
| parent | c1830a77a7fe0f1ccd52f405cb076d40fe085e2f (diff) | |
| download | frameworks_base-277bfd7cdd889e4f59e57925b90d1899f7312c4e.zip frameworks_base-277bfd7cdd889e4f59e57925b90d1899f7312c4e.tar.gz frameworks_base-277bfd7cdd889e4f59e57925b90d1899f7312c4e.tar.bz2 | |
am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 0d34ff6..eeb5b7b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -6215,7 +6215,7 @@ public class WebView extends AbsoluteLayout if (hscroll != 0 || vscroll != 0) { final int vdelta = (int) (vscroll * getVerticalScrollFactor()); final int hdelta = (int) (hscroll * getHorizontalScrollFactor()); - if (pinScrollBy(hdelta, vdelta, true, 0)) { + if (pinScrollBy(hdelta, vdelta, false, 0)) { return true; } } |