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

am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo

Browse Source 
Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken

* commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0':
  Fix a WebView scrolling regression - bug 2633572.
This commit is contained in:
Adam Powell
2010-04-27 12:11:04 -07:00
committed by Android Git Automerger
parent 018579c473 b40cfc162f
commit 067521f95e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebView.java
View File

@@ -4814,6 +4814,8 @@ public class WebView extends AbsoluteLayout
boolean done = false;
boolean keepScrollBarsVisible = false;
if (Math.abs(fDeltaX) < 1.0f && Math.abs(fDeltaY) < 1.0f) {
mLastTouchX = x;
mLastTouchY = y;
keepScrollBarsVisible = done = true;
} else {
if (mSnapScrollMode == SNAP_X || mSnapScrollMode == SNAP_Y) {
@@ -4865,6 +4867,8 @@ public class WebView extends AbsoluteLayout
} else {
// keep the scrollbar on the screen even there is no
// scroll
mLastTouchX = x;
mLastTouchY = y;
keepScrollBarsVisible = true;
}
mLastTouchTime = eventTime;