diff options
author | Adam Powell <adamp@google.com> | 2011-03-14 18:37:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:37:18 -0700 |
commit | 75a1ef8d14de25850a171ee80fc7f9a5b70611b5 (patch) | |
tree | 99b0cd16f51ba282aefcc1aa0d65212cd051ff43 | |
parent | 24f4e33faf1ab76cdc9bea05707b8c5fe090d856 (diff) | |
parent | 15c9ab336eff66cafa365e9ea3a81f9f1b5c2635 (diff) | |
download | frameworks_base-75a1ef8d14de25850a171ee80fc7f9a5b70611b5.zip frameworks_base-75a1ef8d14de25850a171ee80fc7f9a5b70611b5.tar.gz frameworks_base-75a1ef8d14de25850a171ee80fc7f9a5b70611b5.tar.bz2 |
am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '15c9ab336eff66cafa365e9ea3a81f9f1b5c2635':
Fix bug 4099023 - Phantom clicks on some websites
-rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index b3adf2d..dfdae53 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -5369,7 +5369,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() { |