Android: QtEditText support for full-screen soft keyboard

Full-screen soft keyboard support added. Including functionality
for copy-cut-paste and line change.

Future TODO QTBUG-121522

Task-number: QTBUG-109367
Pick-to: 6.7 6.6 6.5 6.2
Change-Id: Ia5632cacc910c7ebde0e40608c2abd027b8f953a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

2 files changed, 42 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index f6404fb00a..5d13a297e3 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -312,6 +312,18 @@ static jboolean updateCursorPosition(JNIEnv */*env*/, jobject /*thiz*/)
     return true;
 }
 
+static void reportFullscreenMode(JNIEnv */*env*/, jobject /*thiz*/, jboolean enabled)
+{
+    if (!m_androidInputContext)
+        return;
+
+    runOnQtThread([&]{m_androidInputContext->reportFullscreenMode(enabled);});
+}
+
+static jboolean fullscreenMode(JNIEnv */*env*/, jobject /*thiz*/)
+{
+    return m_androidInputContext ? m_androidInputContext->fullscreenMode() : false;
+}
 
 static JNINativeMethod methods[] = {
     {"beginBatchEdit", "()Z", (void *)beginBatchEdit},
@@ -332,7 +344,9 @@ static JNINativeMethod methods[] = {
     {"copy", "()Z", (void *)copy},
     {"copyURL", "()Z", (void *)copyURL},
     {"paste", "()Z", (void *)paste},
-    {"updateCursorPosition", "()Z", (void *)updateCursorPosition}
+    {"updateCursorPosition", "()Z", (void *)updateCursorPosition},
+    {"reportFullscreenMode", "(Z)V", (void *)reportFullscreenMode},
+    {"fullscreenMode", "()Z", (void *)fullscreenMode}
 };
 
 static QRect screenInputItemRectangle()
@@ -349,6 +363,7 @@ QAndroidInputContext::QAndroidInputContext()
     , m_handleMode(Hidden)
     , m_batchEditNestingLevel(0)
     , m_focusObject(0)
+    , m_fullScreenMode(false)
 {
     QJniEnvironment env;
     jclass clazz = env.findClass(QtNativeInputConnectionClassName);
@@ -541,6 +556,10 @@ bool QAndroidInputContext::isImhNoTextHandlesSet()
 
 void QAndroidInputContext::updateSelectionHandles()
 {
+    if (m_fullScreenMode) {
+        QtAndroidInput::updateHandles(Hidden);
+        return;
+    }
     static bool noHandles = qEnvironmentVariableIntValue("QT_QPA_NO_TEXT_HANDLES");
     if (noHandles || !m_focusObject)
         return;
@@ -1104,6 +1123,25 @@ jboolean QAndroidInputContext::finishComposingText()
     return JNI_TRUE;
 }
 
+void QAndroidInputContext::reportFullscreenMode(jboolean enabled)
+{
+    m_fullScreenMode = enabled;
+    BatchEditLock batchEditLock(this);
+    if (!focusObjectStopComposing())
+        return;
+
+    if (enabled)
+        m_handleMode = Hidden;
+
+    updateSelectionHandles();
+}
+
+// Called in calling thread's context
+jboolean QAndroidInputContext::fullscreenMode()
+{
+    return m_fullScreenMode;
+}
+
 bool QAndroidInputContext::focusObjectIsComposing() const
 {
     return m_composingCursor != -1;
diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h
index 0f0c4de4ae..038286c4b8 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.h
+++ b/src/plugins/platforms/android/qandroidinputcontext.h
@@ -100,6 +100,8 @@ public:
     jboolean copy();
     jboolean copyURL();
     jboolean paste();
+    void reportFullscreenMode(jboolean enabled);
+    jboolean fullscreenMode();
 
 public slots:
     void safeCall(const std::function<void()> &func, Qt::ConnectionType conType = Qt::BlockingQueuedConnection);
@@ -132,6 +134,7 @@ private:
     int m_batchEditNestingLevel;
     QPointer<QObject> m_focusObject;
     QTimer m_hideCursorHandleTimer;
+    bool m_fullScreenMode;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QAndroidInputContext::HandleModes)
 QT_END_NAMESPACE