Merge remote-tracking branch 'origin/5.9' into 5.11

 Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e

1 files changed, 17 insertions, 10 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
index e6814c202d..4f2c06644d 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
@@ -51,6 +51,7 @@ import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 import android.widget.PopupWindow;
 import android.app.Activity;
+import android.util.TypedValue;
 import android.view.ViewTreeObserver;
 
 /* This view represents one of the handle (selection or cursor handle) */
@@ -58,8 +59,9 @@ class CursorView extends ImageView
 {
     private CursorHandle mHandle;
     // The coordinare which where clicked
-    private int m_offsetX;
-    private int m_offsetY;
+    private float m_offsetX;
+    private float m_offsetY;
+    private boolean m_pressed = false;
 
     CursorView (Context context, CursorHandle handle) {
         super(context);
@@ -76,21 +78,23 @@ class CursorView extends ImageView
     public boolean onTouchEvent(MotionEvent ev) {
         switch (ev.getActionMasked()) {
         case MotionEvent.ACTION_DOWN: {
-            m_offsetX = Math.round(ev.getRawX());
-            m_offsetY = Math.round(ev.getRawY());
+            m_offsetX = ev.getRawX();
+            m_offsetY = ev.getRawY() + getHeight() / 2;
+            m_pressed = true;
             break;
         }
 
         case MotionEvent.ACTION_MOVE: {
-            mHandle.updatePosition(Math.round(ev.getRawX()) - m_offsetX,
-                                    Math.round(ev.getRawY()) - m_offsetY);
+            if (!m_pressed)
+                return false;
+            mHandle.updatePosition(Math.round(ev.getRawX() - m_offsetX),
+                                    Math.round(ev.getRawY() - m_offsetY));
             break;
         }
 
         case MotionEvent.ACTION_UP:
-            break;
-
         case MotionEvent.ACTION_CANCEL:
+            m_pressed = false;
             break;
         }
         return true;
@@ -113,6 +117,7 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
     private int m_lastY;
     int tolerance;
     private boolean m_rtl;
+    int m_yShift;
 
     public CursorHandle(Activity activity, View layout, int id, int attr, boolean rtl) {
         m_activity = activity;
@@ -121,7 +126,8 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
         m_layout = layout;
         DisplayMetrics metrics = new DisplayMetrics();
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-        tolerance = Math.round(2 * metrics.density);
+        m_yShift = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1f, metrics);
+        tolerance = Math.min(1, (int)(m_yShift / 2f));
         m_lastX = m_lastY = -1 - tolerance;
         m_rtl = rtl;
     }
@@ -158,7 +164,7 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
         m_layout.getLocationOnScreen(location);
 
         int x2 = x + location[0];
-        int y2 = y + location[1];
+        int y2 = y + location[1] + m_yShift;
 
         if (m_id == QtNative.IdCursorHandle) {
             x2 -= m_cursorView.getWidth() / 2 ;
@@ -187,6 +193,7 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
 
     // The handle was dragged by a given relative position
     public void updatePosition(int x, int y) {
+        y -= m_yShift;
         if (Math.abs(m_lastX - x) > tolerance || Math.abs(m_lastY - y) > tolerance) {
             QtNative.handleLocationChanged(m_id, x + m_posX, y + m_posY);
             m_lastX = x;