summaryrefslogtreecommitdiffstats
path: root/src/android
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-08-19 05:41:22 +0000
commitd721300fe0c4ee45e6dfdea011d436896eba235d (patch)
treec699fdc65859c40595910b73b0bff90053ad8bef /src/android
parent46214c96af6c9be337ce0a67fbaed1651815e7bd (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)
Diffstat (limited to 'src/android')
-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 f776888652..98d9e81ba9 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -878,7 +878,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()