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

am f7b4accb: Fix scroll jump in ScrollView.

Browse Source 
Merge commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9' into eclair-mr2-plus-aosp

* commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9':
  Fix scroll jump in ScrollView.
This commit is contained in:
Romain Guy
2009-12-01 19:05:57 -08:00
committed by Android Git Automerger
parent 1109703c59 f7b4accbda
commit e8b002ba63
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3990,6 +3990,13 @@ public class WebView extends AbsoluteLayout
} }
mTouchMode = TOUCH_DRAG_MODE; mTouchMode = TOUCH_DRAG_MODE;
mLastTouchX = x;
mLastTouchY = y;
fDeltaX = 0.0f;
fDeltaY = 0.0f;
deltaX = 0;
deltaY = 0;
WebViewCore.pauseUpdate(mWebViewCore); WebViewCore.pauseUpdate(mWebViewCore);
if (!mDragFromTextInput) { if (!mDragFromTextInput) {
nativeHideCursor(); nativeHideCursor();

3
core/java/android/widget/ScrollView.java
View File

@@ -51,8 +51,6 @@ import java.util.List;
* <p>ScrollView only supports vertical scrolling. * <p>ScrollView only supports vertical scrolling.
*/ */
public class ScrollView extends FrameLayout { public class ScrollView extends FrameLayout {
static final String TAG = "ScrollView";
static final int ANIMATED_SCROLL_GAP = 250; static final int ANIMATED_SCROLL_GAP = 250;
static final float MAX_SCROLL_FACTOR = 0.5f; static final float MAX_SCROLL_FACTOR = 0.5f;
@@ -401,6 +399,7 @@ public class ScrollView extends FrameLayout {
final int yDiff = (int) Math.abs(y - mLastMotionY); final int yDiff = (int) Math.abs(y - mLastMotionY);
if (yDiff > mTouchSlop) { if (yDiff > mTouchSlop) {
mIsBeingDragged = true; mIsBeingDragged = true;
mLastMotionY = y;
} }
break; break;