summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJani Korteniemi <jani.korteniemi@qt.io>2025-07-10 15:03:17 +0300
committerJani Korteniemi <jani.korteniemi@qt.io>2025-07-24 19:52:41 +0300
commit5ef73686cfb488dfc6a4077a2ecb12f883de1461 (patch)
tree4f80c17fa5c28bc0dddc59ee93f388c48de4324b /src
parent26b349f5693559e26e88c118812476bcc6aed8d3 (diff)
Re-land: Android: destroy the window surface only after exit transition
Splash screen (or blank launch screen) is shown when exiting the Android application caused by hiding shown windows and destroying it's surface before application exit. On application exit all windows are first set to invisible then surfaces destroyed and finally removed from layout. Also window opacity change can show underlying splash screen as it is set as theme for the application. When pressing Android device's back button application either should hide current window or exit the application. When exiting current window should be visible during application exit. Add AtomicBoolean m_canBeDestroyed to QtWindow for blocking normal surface removal. Set false by default from QtActivityDelegate.addTopLevelWindow and changed from QAndroidPlatformWindow::setVisible() dependent on if there are more visible windows present. Destroy last window with delay so it can be shown during app exit. Set full screen flags for current window on pre Android 11 so it's decor view can scale to full screen on multi-window mode view is when updated. In QtActivityDelegate.setUpSplashScreen() set layout to use android device's DayNight theme colors to not show splash screen theme if window opacity is changed. Previous reverted change caused crashed tst_qmltc_examples test. Previous SHA e40d9d43614b71c803a92fc640fc66f9a96cb095 Fixes: QTBUG-127705 Task-number: QTBUG-124140 Pick-to: 6.8 6.9 6.10 Change-Id: Ifda904c08c3b4363005e953e5ba9ff15a46e5195 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java43
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtWindow.java58
-rw-r--r--src/plugins/platforms/android/qandroidplatformwindow.cpp7
3 files changed, 87 insertions, 21 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
index 7dd00358546..038aff3c0b1 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -9,9 +9,11 @@ import android.app.Activity;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
+import android.content.res.TypedArray;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.Rect;
+import android.graphics.Color;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
@@ -39,7 +41,6 @@ class QtActivityDelegate extends QtActivityDelegateBase
private boolean m_splashScreenSticky = false;
private boolean m_backendsRegistered = false;
- private View m_dummyView = null;
private final HashMap<Integer, View> m_nativeViews = new HashMap<>();
QtActivityDelegate(Activity activity)
@@ -197,6 +198,19 @@ class QtActivityDelegate extends QtActivityDelegateBase
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT));
m_layout.addView(m_splashScreen);
+
+ // Set DayNight theme as layout background so splash screen
+ // is not visible with opaque windows.
+ TypedArray typedArray = m_activity.getTheme().obtainStyledAttributes(
+ android.R.style.Theme_DeviceDefault_DayNight,
+ new int[]{ android.R.attr.colorBackground });
+ try {
+ int backgroundColor = typedArray.getColor(0, Color.WHITE);
+ Drawable background = new ColorDrawable(backgroundColor);
+ m_layout.setBackground(background);
+ } finally {
+ typedArray.recycle();
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -368,15 +382,9 @@ class QtActivityDelegate extends QtActivityDelegateBase
if (m_layout == null)
return;
- if (m_topLevelWindows.isEmpty()) {
- if (m_dummyView != null) {
- m_layout.removeView(m_dummyView);
- m_dummyView = null;
- }
- }
-
m_layout.addView(window, m_topLevelWindows.size());
m_topLevelWindows.put(window.getId(), window);
+ window.setToDestroy(false);
if (!m_splashScreenSticky)
hideSplashScreen();
});
@@ -390,13 +398,13 @@ class QtActivityDelegate extends QtActivityDelegateBase
if (m_topLevelWindows.containsKey(id)) {
QtWindow window = m_topLevelWindows.remove(id);
window.setOnApplyWindowInsetsListener(null); // Set in QtWindow for safe margins
- if (m_topLevelWindows.isEmpty()) {
- // Keep last frame in stack until it is replaced to get correct
- // shutdown transition
- m_dummyView = window;
- } else if (m_layout != null) {
- m_layout.removeView(window);
- }
+ if (window.isFrontmostVisibleWindow()) {
+ window.setToDestroy(true);
+ // Keep current shown window open during shutdown transition
+ m_layout.postDelayed(() -> { window.destroySurface(); }, 500);
+ } else if (m_layout != null) {
+ m_layout.removeView(window);
+ }
}
});
}
@@ -452,11 +460,6 @@ class QtActivityDelegate extends QtActivityDelegateBase
return;
QtNative.runAction(()-> {
- if (m_dummyView != null) {
- m_layout.removeView(m_dummyView);
- m_dummyView = null;
- }
-
if (m_nativeViews.containsKey(id))
m_layout.removeView(m_nativeViews.remove(id));
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
index e4f489a39da..905803750e8 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
@@ -20,6 +20,7 @@ import android.view.WindowInsets;
import android.os.Build;
import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
@SuppressLint("ViewConstructor")
class QtWindow extends QtLayout implements QtSurfaceInterface {
@@ -30,6 +31,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
private GestureDetector m_gestureDetector;
private final QtEditText m_editText;
private final QtInputConnection.QtInputConnectionListener m_inputConnectionListener;
+ private final AtomicBoolean m_canBeDestroyed = new AtomicBoolean(true);
private static native void setSurface(int windowId, Surface surface);
private static native void safeAreaMarginsChanged(Insets insets, int id);
@@ -157,6 +159,60 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
QtNative.runAction(() -> setVisibility(visible ? View.VISIBLE : View.INVISIBLE));
}
+ // Use only for Qt for Android and not Qt Quick for Android
+ @UsedFromNativeCode
+ public void setToDestroy(boolean destroy)
+ {
+ m_canBeDestroyed.set(destroy);
+ }
+
+ // Use only for Qt for Android and not Qt Quick for Android
+ private QtLayout getParentContainer()
+ {
+ if (!(getParent() instanceof QtLayout))
+ return null;
+ return (QtLayout) getParent();
+ }
+
+ // Use only for Qt for Android and not Qt Quick for Android
+ public boolean isFrontmostVisibleWindow()
+ {
+ QtLayout parent = getParentContainer();
+ if (getVisibility() != View.VISIBLE || parent == null)
+ return false;
+
+ for (int index = parent.indexOfChild(this) + 1; index < parent.getChildCount(); index ++) {
+ View child = parent.getChildAt(index);
+ if (child instanceof QtWindow && child.isShown())
+ return false;
+ }
+
+ return true;
+ }
+
+ // Use only for Qt for Android and not Qt Quick for Android
+ @UsedFromNativeCode
+ public boolean isLastVisibleTopLevelWindow()
+ {
+ QtLayout parent = getParentContainer();
+ if (getVisibility() != View.VISIBLE || parent == null)
+ return false;
+
+ for (int index = parent.indexOfChild(this) - 1; index >= 0; index--) {
+ View child = parent.getChildAt(index);
+ if (child instanceof QtWindow) {
+ QtWindow childWindow = (QtWindow) child;
+ if (child.getVisibility() == View.VISIBLE && !childWindow.m_canBeDestroyed.get())
+ return false;
+ }
+ }
+
+ if (parent.getChildCount() > 1 && !isFrontmostVisibleWindow())
+ return false;
+
+ return true;
+ }
+
@Override
public void onSurfaceChanged(Surface surface)
{
@@ -223,7 +279,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
void destroySurface()
{
QtNative.runAction(()-> {
- if (m_surfaceContainer != null) {
+ if (m_surfaceContainer != null && m_canBeDestroyed.get()) {
removeView(m_surfaceContainer);
m_surfaceContainer = null;
}
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index 194a08ee09f..efc62047e3e 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -168,6 +168,13 @@ void QAndroidPlatformWindow::setVisible(bool visible)
return;
if (window()->isTopLevel()) {
+ // Do not hide last Qt for Android window.
+ // We don't want the splash screen to be shown during the app's
+ // exit because it would be the foremost visible screen.
+ if (QtAndroid::isQtApplication() && !visible) {
+ visible = m_nativeQtWindow.callMethod<bool>("isLastVisibleTopLevelWindow");
+ m_nativeQtWindow.callMethod<void>("setToDestroy", !visible);
+ }
if (!visible && window() == qGuiApp->focusWindow()) {
platformScreen()->topVisibleWindowChanged();
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-18 15:53:37 +0000