summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndy Stadler <stadler@android.com>2010-09-27 15:51:09 -0700
committerAndy Stadler <stadler@android.com>2010-09-27 15:51:09 -0700
commitb34fd1ff5c3e363a845fee8e18f11951e41fbd0a (patch)
treefa3220e639d54cd6a33caffd13aaaf8558e67f1d /core
parent4e9751f0770c8bfe6f7d57465cba754af5aa942b (diff)
downloadframeworks_base-b34fd1ff5c3e363a845fee8e18f11951e41fbd0a.zip
frameworks_base-b34fd1ff5c3e363a845fee8e18f11951e41fbd0a.tar.gz
frameworks_base-b34fd1ff5c3e363a845fee8e18f11951e41fbd0a.tar.bz2
Allow touch events when clickable *or* longClickable
This matches more closely the behavior or View.onTouchEvent() Bug: 3036477 Change-Id: I8a9135da7f9aeeb1e0537dce15295049013a0243
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 7098bf3..24b1158 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5016,7 +5016,7 @@ public class WebView extends AbsoluteLayout
@Override
public boolean onTouchEvent(MotionEvent ev) {
- if (mNativeClass == 0 || !isClickable() || !isLongClickable()) {
+ if (mNativeClass == 0 || (!isClickable() && !isLongClickable())) {
return false;
}