summaryrefslogtreecommitdiffstats
path: root/src/android/jar
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-06-23 23:32:37 +0200
committerAndy Shaw <andy.shaw@qt.io>2020-06-25 07:32:04 +0200
commit33c24b9b9d0c6ae1899cec2e01bad9df01ca05f6 (patch)
tree1de5832e360dee634118fd83605bcc14f799a78e /src/android/jar
parent66c9033f7d8297f5db438e303576e841b6c0ff80 (diff)
Android: Don't pause when in multi window mode
When the application is in multi window mode then when pausing it should not suspend the application as it can still be visible in the background. Change-Id: I03a561459b2aa04c808b7d4220cd3e558671dd17 Pick-to: 5.15 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/android/jar')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java3
1 files changed, 2 insertions, 1 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 0db9441749..a7c5802c43 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -909,7 +909,8 @@ public class QtActivityDelegate
public void onPause()
{
- QtNative.setApplicationState(ApplicationInactive);
+ if (Build.VERSION.SDK_INT < 24 || !m_activity.isInMultiWindowMode())
+ QtNative.setApplicationState(ApplicationInactive);
}
public void onResume()