am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread

Merge commit 'a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp

* commit 'a16682b5e8ed635910eada23272ba6548922c02e':
  Allow touch events when clickable *or* longClickable
This commit is contained in:
Andy Stadler
2010-09-28 10:06:27 -07:00
committed by Android Git Automerger

View File

@@ -5026,7 +5026,7 @@ public class WebView extends AbsoluteLayout
@Override
public boolean onTouchEvent(MotionEvent ev) {
if (mNativeClass == 0 || !isClickable() || !isLongClickable()) {
if (mNativeClass == 0 || (!isClickable() && !isLongClickable())) {
return false;
}