Merge "Remember entries / title in default Page fn." (b18b31ff) · Commits · e / os / android_frameworks_base

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -139,9 +139,7 @@ private fun NavControllerWrapperImpl.NavContent(allProvider: Collection<Settings
		) + fadeOut(animationSpec = fadeEffect)
		},
		) { navBackStackEntry ->
		val page = remember(navBackStackEntry.arguments) {
		spp.createSettingsPage(navBackStackEntry.arguments)
		}
		val page = remember { spp.createSettingsPage(navBackStackEntry.arguments) }
		page.PageWithEvent()
		}
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.settingslib.spa.framework.common

		import android.os.Bundle
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.navigation.NamedNavArgument
		import com.android.settingslib.spa.widget.scaffold.RegularScaffold

		@@ -52,8 +53,10 @@ interface SettingsPageProvider {
		/** The [Composable] used to render this page. */
		@Composable
		fun Page(arguments: Bundle?) {
		RegularScaffold(title = getTitle(arguments)) {
		for (entry in buildEntry(arguments)) {
		val title = remember { getTitle(arguments) }
		val entries = remember { buildEntry(arguments) }
		RegularScaffold(title) {
		for (entry in entries) {
		entry.UiLayout()
		}
		}