drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo

Browse Source
This commit is contained in:
Grace Kloba
2010-04-01 08:15:09 -07:00
committed by Android (Google) Code Review
parent 3fe1708d9d ad7a1d79f7
commit 461cef5d20
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6413,10 +6413,15 @@ public class WebView extends AbsoluteLayout
mLastDeferTouchY = y;
startDrag();
}
doDrag((int) (mLastDeferTouchX - x),
(int) (mLastDeferTouchY - y));
mLastDeferTouchX = x;
mLastDeferTouchY = y;
int deltaX = pinLocX((int) (mScrollX
+ mLastDeferTouchX - x))
- mScrollX;
int deltaY = pinLocY((int) (mScrollY
+ mLastDeferTouchY - y))
- mScrollY;
doDrag(deltaX, deltaY);
if (deltaX != 0) mLastDeferTouchX = x;
if (deltaY != 0) mLastDeferTouchY = y;
break;
}
case MotionEvent.ACTION_UP: