Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48076da8 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when... 

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

* commit 'c3709f25':
  Improve browser scrolling when using the mouse wheel.
parents aefc94f1 c3709f25

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -6461,7 +6461,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;

                        }

                    }