Merge of (#10212) to Vaadin 7.

Menu Items are not displayed when used in table row using Android 4.0.4.

Change-Id: Ied0f98eeae80cd9014b389d790e76908c3457be1

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index f14c86aa3603287f7f2e6c39db6539bd8ef4da78..021ab8fac1c557041bb2243648a58dabed89df95 100644 (file)
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -5115,9 +5115,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                             dragTouchTimeout.cancel();
                         }
                         if (touchStart != null) {
-                            event.preventDefault();
-                            event.stopPropagation();
                             if (!BrowserInfo.get().isAndroid()) {
+                                event.preventDefault();
+                                event.stopPropagation();
                                 Util.simulateClickFromTouchEvent(touchStart,
                                         this);
                             }