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

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

Browse Source 
* commit 'c2cb8d226399c3cb93bad7008b4049d493d4f1d2':
  Support scrolling layers with the mousewheel
This commit is contained in:
John Reck
2012-08-20 17:35:17 -07:00
committed by Android Git Automerger
parent 8318cf9969 c2cb8d2263
commit d87fd2e136
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());
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;
}
}
}