Merge "[Spa] Workaround an issue of Compose 1.6.0-alpha03" into main (52b977f0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt

+17 −12

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.util.Log
		import androidx.activity.ComponentActivity
		import androidx.activity.compose.setContent
		import androidx.annotation.VisibleForTesting
		import androidx.compose.foundation.layout.Box
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.CompositionLocalProvider
		import androidx.compose.runtime.LaunchedEffect
		@@ -126,6 +127,9 @@ private fun NavControllerWrapperImpl.NavContent(
		allProvider: Collection<SettingsPageProvider>,
		content: @Composable (SettingsPage) -> Unit,
		) {
		// TODO(b/298520326): Remove Box after the issue is fixed.
		// Wrap the top level node into a Box to workaround an issue of Compose 1.6.0-alpha03.
		Box {
		NavHost(
		navController = navController,
		startDestination = NullPageProvider.name,
		@@ -142,6 +146,7 @@ private fun NavControllerWrapperImpl.NavContent(
		}
		}
		}
		}

		@Composable
		private fun NavControllerWrapperImpl.InitialDestination(