diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
commit | 231d3670981a33ec42b91ad1cb33c1fc50551066 (patch) | |
tree | b1ef1096f4e279baaa2ea0d2daf14b5c4185a82f /src/android/java/src/org/qtproject/qt5 | |
parent | tst_QSslCertificate::verify - remove QSKIP (diff) | |
parent | Android: Fix Application becomes unresponsive issue (diff) | |
download | qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.tar.xz qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.zip |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: I0cdb390124e783dc9cd832a9954baa76a0e9eb6b
Diffstat (limited to 'src/android/java/src/org/qtproject/qt5')
-rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 9 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java | 13 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index b27f03fc7d..40db7941aa 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -1141,4 +1141,13 @@ public class QtActivity extends Activity { QtNative.activityDelegate().notifyObjectFocus(viewId); } + public boolean isKeyboardVisible() + { + return QtNative.activityDelegate().isKeyboardVisible(); + } + + public void notifyQtAndroidPluginRunning(boolean running) + { + QtNative.activityDelegate().notifyQtAndroidPluginRunning(running); + } } diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java index cdd6c1efea..67ced7524c 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java @@ -39,8 +39,11 @@ package org.qtproject.qt5.android.bindings; import android.app.Service; import android.content.Intent; import android.content.res.Configuration; +import android.os.Bundle; import android.os.IBinder; +import org.qtproject.qt5.android.QtNative; + public class QtService extends Service { QtServiceLoader m_loader = new QtServiceLoader(this); @@ -153,4 +156,14 @@ public class QtService extends Service return super.onUnbind(intent); } //--------------------------------------------------------------------------- + + public boolean loadApplication(Service service, ClassLoader classLoader, Bundle loaderParams) + { + return QtNative.serviceDelegate().loadApplication(service, classLoader, loaderParams); + } + + public boolean startApplication() + { + return QtNative.serviceDelegate().startApplication(); + } } |