commit fdace52c72e8e2fa18d8bbcc516ba585d3a9278b
author Zekan Qian <pierreqian@google.com> Thu Feb 02 09:59:54 2023 +0800
committer Zekan Qian <pierreqian@google.com> Thu Feb 02 10:10:58 2023 +0800
tree f5390f53958eebf3e5c170c3f4e6bb31d4ff31a6
parent 5d3f6f396d2c7170e0a5c806fd458fd889063a10

Remember entries / title in default Page fn.

Bug: 244122804
Test: unit-test & local build gallery
Change-Id: Iadfe4b2c7f6994767af3fcce54c3d791567dff0a

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

diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt
index a8432d6..bccd8aa 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt
@@ -139,9 +139,7 @@
                     ) + fadeOut(animationSpec = fadeEffect)
                 },
             ) { navBackStackEntry ->
-                val page = remember(navBackStackEntry.arguments) {
-                    spp.createSettingsPage(navBackStackEntry.arguments)
-                }
+                val page = remember { spp.createSettingsPage(navBackStackEntry.arguments) }
                 page.PageWithEvent()
             }
         }

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

diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
index 42e5f7e..c564130 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
@@ -18,6 +18,7 @@
 
 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 @@
     /** 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()
             }
         }