1 files changed, 77 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 656dbdda45..bfdbaed43f 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -2,6 +2,7 @@
 **
 ** Copyright (C) 2014 BogDan Vatra <bogdan@kde.org>
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Android port of the Qt Toolkit.
@@ -143,6 +144,11 @@ public class QtActivityDelegate
     private int m_portraitKeyboardHeight = 0;
     private int m_landscapeKeyboardHeight = 0;
     private int m_probeKeyboardHeightDelay = 50; // ms
+    private CursorHandle m_cursorHandle;
+    private CursorHandle m_leftSelectionHandle;
+    private CursorHandle m_rightSelectionHandle;
+    private EditMenu m_editMenu;
+    private EditPopupMenu m_editPopupMenu;
 
     public void setFullScreen(boolean enterFullScreen)
     {
@@ -470,6 +476,72 @@ public class QtActivityDelegate
         m_imm.updateSelection(m_editText, selStart, selEnd, candidatesStart, candidatesEnd);
     }
 
+    // Values coming from QAndroidInputContext::CursorHandleShowMode
+    private static final int CursorHandleNotShown = 0;
+    private static final int CursorHandleShowNormal = 1;
+    private static final int CursorHandleShowSelection = 2;
+    private static final int CursorHandleShowPopup = 3;
+
+    /* called from the C++ code when the position of the cursor or selection handles needs to
+       be adjusted.
+       mode is one of QAndroidInputContext::CursorHandleShowMode
+    */
+    public void updateHandles(int mode, int x1, int y1, int x2, int y2)
+    {
+        if (mode == CursorHandleNotShown) {
+            if (m_cursorHandle != null)
+                m_cursorHandle.hide();
+            if (m_rightSelectionHandle != null) {
+                m_rightSelectionHandle.hide();
+                m_leftSelectionHandle.hide();
+            }
+            if (m_editMenu != null)
+                m_editMenu.hide();
+            if (m_editPopupMenu != null)
+                m_editPopupMenu.hide();
+        } else if (mode == CursorHandleShowNormal || mode == CursorHandleShowPopup) {
+            if (m_cursorHandle == null) {
+                m_cursorHandle = new CursorHandle(m_activity, m_layout, QtNative.IdCursorHandle,
+                                                  android.R.attr.textSelectHandle);
+            }
+            m_cursorHandle.setPosition(x1, y1);
+            if (m_rightSelectionHandle != null) {
+                m_rightSelectionHandle.hide();
+                m_leftSelectionHandle.hide();
+            }
+        } else if (mode == CursorHandleShowSelection) {
+            if (m_rightSelectionHandle == null) {
+                m_leftSelectionHandle = new CursorHandle(m_activity, m_layout, QtNative.IdLeftHandle,
+                                                         android.R.attr.textSelectHandleLeft);
+                m_rightSelectionHandle = new CursorHandle(m_activity, m_layout, QtNative.IdRightHandle,
+                                                          android.R.attr.textSelectHandleRight);
+            }
+            m_leftSelectionHandle.setPosition(x1,y1);
+            m_rightSelectionHandle.setPosition(x2,y2);
+            if (m_cursorHandle != null)
+                m_cursorHandle.hide();
+
+            if (m_editMenu == null)
+                m_editMenu = new EditMenu(m_activity);
+            m_editMenu.show();
+        }
+
+        // show the edit popup menu
+        if (mode == CursorHandleShowPopup && (m_editMenu == null || !m_editMenu.isShown())
+                && QtNative.hasClipboardText()) {
+            if (m_editPopupMenu == null)
+                m_editPopupMenu = new EditPopupMenu(m_activity, m_layout);
+            if (y2 < m_editPopupMenu.getHeight())  {
+                // If the popup cannot be shown over the text, it must be shown under the anchors
+                y2 = y1 + 2 * m_editPopupMenu.getHeight();
+            }
+            m_editPopupMenu.setPosition(x2, y2);
+        } else if (m_editPopupMenu != null) {
+            m_editPopupMenu.hide();
+        }
+
+    }
+
     public boolean loadApplication(Activity activity, ClassLoader classLoader, Bundle loaderParams)
     {
         /// check parameters integrity
@@ -1383,4 +1455,9 @@ public class QtActivityDelegate
         }
         return false;
     }
+
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
+    {
+        QtNative.sendRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
 }