Merge remote-tracking branch 'qt/dev' into dev-highdpi

Conflicts:
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf

1 files changed, 43 insertions, 21 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index 6855a47554..b7363e5d87 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -43,6 +43,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.ClipboardManager;
+import android.os.Build;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -306,32 +307,49 @@ public class QtNative
 
     static public void sendTouchEvent(MotionEvent event, int id)
     {
-        //@ANDROID-5
-        touchBegin(id);
-        for (int i=0;i<event.getPointerCount();i++) {
-                touchAdd(id,
-                         event.getPointerId(i),
-                         getAction(i, event),
-                         i == 0,
-                         (int)event.getX(i),
-                         (int)event.getY(i),
-                         event.getSize(i),
-                         event.getPressure(i));
-        }
+        int pointerType = 0;
 
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                touchEnd(id,0);
+        if (Build.VERSION.SDK_INT >= 14) {
+            switch (event.getToolType(0)) {
+            case MotionEvent.TOOL_TYPE_STYLUS:
+                pointerType = 1; // QTabletEvent::Pen
                 break;
-
-            case MotionEvent.ACTION_UP:
-                touchEnd(id,2);
+            case MotionEvent.TOOL_TYPE_ERASER:
+                pointerType = 3; // QTabletEvent::Eraser
                 break;
+            // TODO TOOL_TYPE_MOUSE
+            }
+        }
 
-            default:
-                touchEnd(id,1);
+        if (pointerType != 0) {
+            tabletEvent(id, event.getDeviceId(), event.getEventTime(), event.getAction(), pointerType,
+                event.getButtonState(), event.getX(), event.getY(), event.getPressure());
+        } else {
+            touchBegin(id);
+            for (int i = 0; i < event.getPointerCount(); ++i) {
+                    touchAdd(id,
+                             event.getPointerId(i),
+                             getAction(i, event),
+                             i == 0,
+                             (int)event.getX(i),
+                             (int)event.getY(i),
+                             event.getSize(i),
+                             event.getPressure(i));
+            }
+
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    touchEnd(id, 0);
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                    touchEnd(id, 2);
+                    break;
+
+                default:
+                    touchEnd(id, 1);
+            }
         }
-        //@ANDROID-5
     }
 
     static public void sendTrackballEvent(MotionEvent event, int id)
@@ -598,6 +616,10 @@ public class QtNative
     public static native void longPress(int winId, int x, int y);
     // pointer methods
 
+    // tablet methods
+    public static native void tabletEvent(int winId, int deviceId, long time, int action, int pointerType, int buttonState, float x, float y, float pressure);
+    // tablet methods
+
     // keyboard methods
     public static native void keyDown(int key, int unicode, int modifier, boolean autoRepeat);
     public static native void keyUp(int key, int unicode, int modifier, boolean autoRepeat);