summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-09-12 14:19:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-12 14:19:46 -0700
commitc7b29fbb3ea4601e8bfcf8d2ce13c3fbb390de82 (patch)
tree1aa1bf98d7443e851a4de329c2bbb9144f68cbda /core/java/android
parentc66f16ec41c94836f7e6d2425a7a090aa3776dc3 (diff)
parent0a8bf86413f3456c5afc3028b8ba145a3bebe493 (diff)
Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/webkit/WebView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 27178ab711eb..a3a4c43cd961 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4872,6 +4872,7 @@ public class WebView extends AbsoluteLayout
if (detector.isInProgress()) {
mLastTouchTime = eventTime;
cancelLongPress();
+ mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
if (!mZoomManager.supportsPanDuringZoom()) {
return true;
}