1 files changed, 29 insertions, 12 deletions

diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 3b5e656630..a7300484f2 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -27,6 +27,7 @@
 #include <QtCore/qbasicatomic.h>
 #include <QtCore/qjnienvironment.h>
 #include <QtCore/qjniobject.h>
+#include <QtCore/qprocess.h>
 #include <QtCore/qresource.h>
 #include <QtCore/qthread.h>
 #include <QtGui/private/qguiapplication_p.h>
@@ -197,6 +198,12 @@ namespace QtAndroid
                                            "(ILjava/lang/String;)V", accessibilityObjectId, value);
     }
 
+    void notifyScrolledEvent(uint accessibilityObjectId)
+    {
+        QJniObject::callStaticMethod<void>(m_applicationClass, "notifyScrolledEvent", "(I)V",
+                                           accessibilityObjectId);
+    }
+
     void notifyQtAndroidPluginRunning(bool running)
     {
         QJniObject::callStaticMethod<void>(m_applicationClass, "notifyQtAndroidPluginRunning","(Z)V", running);
@@ -445,11 +452,11 @@ static jboolean startQtAndroidPlugin(JNIEnv *env, jobject /*object*/, jstring pa
     m_mainLibraryHnd = nullptr;
 
     const char *nativeString = env->GetStringUTFChars(paramsString, 0);
-    QByteArray string = nativeString;
+    const QStringList argsList = QProcess::splitCommand(QString::fromUtf8(nativeString));
     env->ReleaseStringUTFChars(paramsString, nativeString);
 
-    for (auto str : string.split('\t'))
-        m_applicationParams.append(str.split(' '));
+    for (const QString &arg : argsList)
+        m_applicationParams.append(arg.toUtf8());
 
     // Go home
     QDir::setCurrent(QDir::homePath());
@@ -614,24 +621,27 @@ static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/, jint screenWid
                               jint availableHeightPixels, jdouble xdpi, jdouble ydpi,
                               jdouble scaledDensity, jdouble density, jfloat refreshRate)
 {
+    Q_UNUSED(availableLeftPixels)
+    Q_UNUSED(availableTopPixels)
+
     m_availableWidthPixels = availableWidthPixels;
     m_availableHeightPixels = availableHeightPixels;
     m_scaledDensity = scaledDensity;
     m_density = density;
 
+    const QSize screenSize(screenWidthPixels, screenHeightPixels);
+    // available geometry always starts from top left
+    const QRect availableGeometry(0, 0, availableWidthPixels, availableHeightPixels);
+    const QSize physicalSize(qRound(double(screenWidthPixels) / xdpi * 25.4),
+                             qRound(double(screenHeightPixels) / ydpi * 25.4));
+
     QMutexLocker lock(&m_platformMutex);
     if (!m_androidPlatformIntegration) {
         QAndroidPlatformIntegration::setDefaultDisplayMetrics(
-                availableLeftPixels, availableTopPixels, availableWidthPixels,
-                availableHeightPixels, qRound(double(screenWidthPixels) / xdpi * 25.4),
-                qRound(double(screenHeightPixels) / ydpi * 25.4), screenWidthPixels,
-                screenHeightPixels);
+                availableGeometry.left(), availableGeometry.top(), availableGeometry.width(),
+                availableGeometry.height(), physicalSize.width(), physicalSize.height(),
+                screenSize.width(), screenSize.height());
     } else {
-        const QSize physicalSize(qRound(double(screenWidthPixels) / xdpi * 25.4),
-                                 qRound(double(screenHeightPixels) / ydpi * 25.4));
-        const QSize screenSize(screenWidthPixels, screenHeightPixels);
-        const QRect availableGeometry(availableLeftPixels, availableTopPixels,
-                                      availableWidthPixels, availableHeightPixels);
         m_androidPlatformIntegration->setScreenSizeParameters(physicalSize, screenSize,
                                                               availableGeometry);
         m_androidPlatformIntegration->setRefreshRate(refreshRate);
@@ -745,6 +755,12 @@ static void handleRefreshRateChanged(JNIEnv */*env*/, jclass /*cls*/, jfloat ref
         m_androidPlatformIntegration->setRefreshRate(refreshRate);
 }
 
+static void handleUiDarkModeChanged(JNIEnv */*env*/, jobject /*thiz*/, jint newUiMode)
+{
+    QAndroidPlatformIntegration::setAppearance(
+        (newUiMode == 1 ) ? QPlatformTheme::Appearance::Dark : QPlatformTheme::Appearance::Light);
+}
+
 static void onActivityResult(JNIEnv */*env*/, jclass /*cls*/,
                              jint requestCode,
                              jint resultCode,
@@ -774,6 +790,7 @@ static JNINativeMethod methods[] = {
     { "setSurface", "(ILjava/lang/Object;II)V", (void *)setSurface },
     { "updateWindow", "()V", (void *)updateWindow },
     { "updateApplicationState", "(I)V", (void *)updateApplicationState },
+    { "handleUiDarkModeChanged", "(I)V", (void *)handleUiDarkModeChanged },
     { "handleOrientationChanged", "(II)V", (void *)handleOrientationChanged },
     { "onActivityResult", "(IILandroid/content/Intent;)V", (void *)onActivityResult },
     { "onNewIntent", "(Landroid/content/Intent;)V", (void *)onNewIntent },