Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev

Browse Source
This commit is contained in:
John Reck
2012-08-20 17:33:19 -07:00
committed by Android (Google) Code Review
parent a5d5d608cc f2e6115404
commit c2cb8d2263
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/WebViewClassic.java
View File

@@ -6448,9 +6448,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
mWebViewPrivate.getVerticalScrollFactor()); mWebViewPrivate.getVerticalScrollFactor());
final int hdelta = (int) (hscroll * final int hdelta = (int) (hscroll *
mWebViewPrivate.getHorizontalScrollFactor()); 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;
} }
} }
} }