am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2

* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
  Improve browser scrolling when using the mouse wheel.
This commit is contained in:
Jeff Brown
2011-06-06 20:32:02 -07:00
committed by Android Git Automerger

View File

@ -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;
}
}