summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-06-23 23:32:37 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-06-25 09:02:24 +0000
commit575e0e8cbbd4c8d72ff36609c9e52f8c992a45fe (patch)
tree11a71115dcee8e0d4983fee16319fc2ac9baefd5 /src/android/jar/src
parenta5dd0b4e68724ecd7335c7d20e4df5aa17f1a205 (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 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 33c24b9b9d0c6ae1899cec2e01bad9df01ca05f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android/jar/src')
-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 2df2ed9a1d..613a2fefc6 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -892,7 +892,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()