summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebViewClassic.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-14 10:33:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-14 10:33:03 -0700
commit1cc2374f289a6316a907d5e90ee1ba89130fced9 (patch)
tree708d1c2c74f1b1a174b22080b0066c05c4914784 /core/java/android/webkit/WebViewClassic.java
parent0b73f8fbc66914d1b6267fa4723c54f1e52f374f (diff)
parentd6bcfeb5e9bd5d198d81d48bf817e7f028e4e384 (diff)
downloadframeworks_base-1cc2374f289a6316a907d5e90ee1ba89130fced9.zip
frameworks_base-1cc2374f289a6316a907d5e90ee1ba89130fced9.tar.gz
frameworks_base-1cc2374f289a6316a907d5e90ee1ba89130fced9.tar.bz2
am d6bcfeb5: am d54d7cfe: Merge "Call WebView.performLongClick instead of performLongClick()" into jb-dev
* commit 'd6bcfeb5e9bd5d198d81d48bf817e7f028e4e384': Call WebView.performLongClick instead of performLongClick()
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
-rw-r--r--core/java/android/webkit/WebViewClassic.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index e456a64..2a671af 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -1318,7 +1318,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
case WebViewInputDispatcher.EVENT_TYPE_LONG_PRESS:
HitTestResult hitTest = getHitTestResult();
if (hitTest != null) {
- performLongClick();
+ mWebView.performLongClick();
}
break;
case WebViewInputDispatcher.EVENT_TYPE_DOUBLE_TAP:
@@ -7337,7 +7337,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
// the states
mGotCenterDown = false;
mTrackballDown = false;
- performLongClick();
+ mWebView.performLongClick();
break;
case WEBCORE_NEED_TOUCH_EVENTS: