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.

core/java/android/webkit/WebView.java

@@ -4571,9 +4571,11 @@ public class WebView extends AbsoluteLayout
                     break;
                 }
                 case SWITCH_TO_LONGPRESS: {
+                    if (!mPreventDrag) {
                         mTouchMode = TOUCH_DONE_MODE;
                         performLongClick();
                         updateTextEntry();
+                    }
                     break;
                 }
                 case SWITCH_TO_ENTER: