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

am fe72c533: am 461cef5d: 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 
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
This commit is contained in:
Grace Kloba
2010-04-01 08:20:48 -07:00
committed by Android Git Automerger
parent 673e672050 fe72c533fe
commit 0aca8f9c6b
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: