fix(android): prevent splash screen from being shown during navigation (#10999)

CatchABus · web-flow · commit 584755d32399 · 2025-12-03T14:38:46.000-08:00
diff --git a/packages/core/application/application.android.ts b/packages/core/application/application.android.ts
@@ -45,6 +45,7 @@ import { androidGetForegroundActivity, androidGetStartActivity, androidSetForegr
 import { getImageFetcher, getNativeApp, getRootView, initImageCache, setA11yUpdatePropertiesCallback, setApplicationPropertiesCallback, setAppMainEntry, setNativeApp, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
 import { getNativeScriptGlobals } from '../globals/global-utils';
 import type { AndroidApplication as IAndroidApplication } from './application';
+import { enableEdgeToEdge } from '../utils/native-helper-for-android';
 import lazy from '../utils/lazy';
 
 declare class NativeScriptLifecycleCallbacks extends android.app.Application.ActivityLifecycleCallbacks {}
@@ -66,6 +67,9 @@ function initNativeScriptLifecycleCallbacks() {
 			// console.log('NativeScriptLifecycleCallbacks onActivityCreated');
 			this.setThemeOnLaunch(activity);
 
+			// Make sure to call this after setThemeOnLaunch, otherwise it'll cause issues with window decoration
+			enableEdgeToEdge(activity);
+
 			if (!Application.android.startActivity) {
 				Application.android.setStartActivity(activity);
 			}
diff --git a/packages/core/ui/frame/activity.android.ts b/packages/core/ui/frame/activity.android.ts
@@ -2,7 +2,6 @@ import '../../globals';
 import { setActivityCallbacks } from '.';
 import { Application } from '../../application';
 import { isEmbedded } from '../embedding';
-import { enableEdgeToEdge } from '../../utils/native-helper-for-android';
 const EMPTY_FN = () => {};
 declare const com: any;
 
@@ -22,7 +21,7 @@ if (!isEmbedded()) {
 			// Set isNativeScriptActivity in onCreate.
 			// The JS constructor might not be called because the activity is created from Android.
 			this.isNativeScriptActivity = true;
-			enableEdgeToEdge(this);
+
 			if (!this._callbacks) {
 				setActivityCallbacks(this);
 			}
@@ -79,7 +78,7 @@ if (!isEmbedded()) {
 			// Set isNativeScriptActivity in onCreate.
 			// The JS constructor might not be called because the activity is created from Android.
 			activity.isNativeScriptActivity = true;
-			enableEdgeToEdge(this);
+
 			if (!activity._callbacks) {
 				setActivityCallbacks(activity);
 			}
