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

am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2

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

* commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3':
  If we get TOUCH_UP before getting the WebCore's
This commit is contained in:
Grace Kloba
2010-03-01 13:11:55 -08:00
committed by Android Git Automerger
parent a630dcdb95 cfb50c66fa
commit 3ca122df9e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4441,6 +4441,14 @@ public class WebView extends AbsoluteLayout
if (mFullScreenHolder == null
&& (computeHorizontalScrollExtent() < computeHorizontalScrollRange()
|| computeVerticalScrollExtent() < computeVerticalScrollRange())) {
// remove the pending TOUCH_EVENT and send a
// cancel
mWebViewCore
.removeMessages(EventHub.TOUCH_EVENT);
WebViewCore.TouchEventData ted = new WebViewCore.TouchEventData();
ted.mAction = MotionEvent.ACTION_CANCEL;
mWebViewCore.sendMessage(EventHub.TOUCH_EVENT,
ted);
// we will not rewrite drag code here, but we
// will try fling if it applies.
WebViewCore.pauseUpdate(mWebViewCore);