Merge change 5390 into donut

* changes: When mPreventDrag is true, don't respond to long press. This should prevent the context menu popping up in the Map sites.
2009-06-25 13:18:24 -07:00
parent 24a4f20c0b 6c451b766d
commit 7cb8182e36
1 changed files with 5 additions and 3 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@ -4571,9 +4571,11 @@ public class WebView extends AbsoluteLayout
                    break;
                }
                case SWITCH_TO_LONGPRESS: {
-                    mTouchMode = TOUCH_DONE_MODE;
-                    performLongClick();
-                    updateTextEntry();
+                    if (!mPreventDrag) {
+                        mTouchMode = TOUCH_DONE_MODE;
+                        performLongClick();
+                        updateTextEntry();
+                    }
                    break;
                }
                case SWITCH_TO_ENTER: