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

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

Browse Source 
Merge commit '2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp

* commit '2ea21a84ef81849153f30bbea213acd5be110c08':
  Fix a WebView scrolling regression - bug 2633572.
This commit is contained in:
Adam Powell
2010-04-27 12:08:01 -07:00
committed by Android Git Automerger
parent b2dbae879d 2ea21a84ef
commit b40cfc162f
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 done = false;
boolean keepScrollBarsVisible = false; boolean keepScrollBarsVisible = false;
if (Math.abs(fDeltaX) < 1.0f && Math.abs(fDeltaY) < 1.0f) { if (Math.abs(fDeltaX) < 1.0f && Math.abs(fDeltaY) < 1.0f) {
mLastTouchX = x;
mLastTouchY = y;
keepScrollBarsVisible = done = true; keepScrollBarsVisible = done = true;
} else { } else {
if (mSnapScrollMode == SNAP_X || mSnapScrollMode == SNAP_Y) { if (mSnapScrollMode == SNAP_X || mSnapScrollMode == SNAP_Y) {
@@ -4865,6 +4867,8 @@ public class WebView extends AbsoluteLayout
} else { } else {
// keep the scrollbar on the screen even there is no // keep the scrollbar on the screen even there is no
// scroll // scroll
mLastTouchX = x;
mLastTouchY = y;
keepScrollBarsVisible = true; keepScrollBarsVisible = true;
} }
mLastTouchTime = eventTime; mLastTouchTime = eventTime;