1 files changed, 23 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/src/androidjnimain.cpp b/src/plugins/platforms/android/src/androidjnimain.cpp
index 74183b3107..b426839f3d 100644
--- a/src/plugins/platforms/android/src/androidjnimain.cpp
+++ b/src/plugins/platforms/android/src/androidjnimain.cpp
@@ -55,6 +55,7 @@
 #include <stdlib.h>
 
 #include "androidjnimain.h"
+#include "androidjniaccessibility.h"
 #include "androidjniinput.h"
 #include "androidjniclipboard.h"
 #include "androidjnimenu.h"
@@ -88,6 +89,9 @@ static AAssetManager *m_assetManager = NULL;
 static jobject m_resourcesObj;
 static jobject m_activityObject = NULL;
 
+static bool m_activityActive = true; // defaults to true because when the platform plugin is
+                                     // initialized, QtActivity::onResume() has already been called
+
 static jclass m_bitmapClass  = 0;
 static jmethodID m_createBitmapMethodID = 0;
 static jobject m_ARGB_8888_BitmapConfigValue = 0;
@@ -319,6 +323,12 @@ namespace QtAndroid
         return m_activityObject;
     }
 
+    void setApplicationActive()
+    {
+        if (m_activityActive)
+            QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
+    }
+
     jobject createBitmap(QImage img, JNIEnv *env)
     {
         if (img.format() != QImage::Format_ARGB32 && img.format() != QImage::Format_RGB16)
@@ -655,6 +665,16 @@ static void updateWindow(JNIEnv */*env*/, jobject /*thiz*/)
 #endif
 }
 
+static void updateApplicationState(JNIEnv */*env*/, jobject /*thiz*/, jint state)
+{
+    m_activityActive = (state == Qt::ApplicationActive);
+
+    if (!m_androidPlatformIntegration)
+        return;
+
+    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationState(state));
+}
+
 static void handleOrientationChanged(JNIEnv */*env*/, jobject /*thiz*/, jint newOrientation)
 {
     if (m_androidPlatformIntegration == 0)
@@ -681,6 +701,7 @@ static JNINativeMethod methods[] = {
     {"lockSurface", "()V", (void *)lockSurface},
     {"unlockSurface", "()V", (void *)unlockSurface},
     {"updateWindow", "()V", (void *)updateWindow},
+    {"updateApplicationState", "(I)V", (void *)updateApplicationState},
     {"handleOrientationChanged", "(I)V", (void *)handleOrientationChanged}
 };
 
@@ -797,7 +818,8 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
     if (!registerNatives(env)
             || !QtAndroidInput::registerNatives(env)
             || !QtAndroidClipboard::registerNatives(env)
-            || !QtAndroidMenu::registerNatives(env)) {
+            || !QtAndroidMenu::registerNatives(env)
+            || !QtAndroidAccessibility::registerNatives(env)) {
         __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
         return -1;
     }