summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-03-14 18:33:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-14 18:33:56 -0700
commit15c9ab336eff66cafa365e9ea3a81f9f1b5c2635 (patch)
tree017218ae0055d6623a3aba059f48be0f7707bd0f
parent71ee3ba0f08b4be70bf986ea2c7f9f5261bca8a2 (diff)
parent57fccf12e1e71089aa01cbf9867314f82db4e6f9 (diff)
downloadframeworks_base-15c9ab336eff66cafa365e9ea3a81f9f1b5c2635.zip
frameworks_base-15c9ab336eff66cafa365e9ea3a81f9f1b5c2635.tar.gz
frameworks_base-15c9ab336eff66cafa365e9ea3a81f9f1b5c2635.tar.bz2
am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9': Fix bug 4099023 - Phantom clicks on some websites
-rw-r--r--core/java/android/webkit/WebView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4aa1f5e..1a574d5 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5384,7 +5384,8 @@ public class WebView extends AbsoluteLayout
private boolean shouldForwardTouchEvent() {
return mFullScreenHolder != null || (mForwardTouchEvents
&& !mSelectingText
- && mPreventDefault != PREVENT_DEFAULT_IGNORE);
+ && mPreventDefault != PREVENT_DEFAULT_IGNORE
+ && mPreventDefault != PREVENT_DEFAULT_NO);
}
private boolean inFullScreenMode() {