Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remember entries / title in default Page fn."

Browse Source
This commit is contained in:
Zekan Qian
2023-02-02 05:21:44 +00:00
committed by Android (Google) Code Review
parent 852097f544 fdace52c72
commit b18b31ff94
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()
}
}

7
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
View File

@@ -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()
}
}