Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Change-Id: I0cdb390124e783dc9cd832a9954baa76a0e9eb6b

1 files changed, 8 insertions, 4 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 38cc695c37..feb47c8f90 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
@@ -159,11 +159,15 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
     public void setPosition(final int x, final int y){
         initOverlay();
 
-        final int[] location = new int[2];
-        m_layout.getLocationOnScreen(location);
+        final int[] layoutLocation = new int[2];
+        m_layout.getLocationOnScreen(layoutLocation);
+
+        // This value is used for handling split screen case
+        final int[] activityLocation = new int[2];
+        m_activity.getWindow().getDecorView().getLocationOnScreen(activityLocation);
 
-        int x2 = x + location[0];
-        int y2 = y + location[1] + m_yShift;
+        int x2 = x + layoutLocation[0] - activityLocation[0];
+        int y2 = y + layoutLocation[1] + m_yShift - activityLocation[1];
 
         if (m_id == QtNative.IdCursorHandle) {
             x2 -= m_popup.getWidth() / 2 ;