Merge "Add System update for Software Update." into main

src/com/android/settings/spa/SettingsSpaEnvironment.kt

@@ -82,7 +82,16 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
             allProviders = getTogglePermissionAppListProviders()
         )
         SettingsPageProviderRepository(
-            allPageProviders = listOf(
+            allPageProviders = settingsPageProviders()
+                + togglePermissionAppListTemplate.createPageProviders(),
+            rootPages = listOf(
+                HomePageProvider.createSettingsPage()
+            ),
+        )
+    }
+
+
+    open fun settingsPageProviders() = listOf(
         HomePageProvider,
         AppsMainPageProvider,
         AllAppListPageProvider,
@@ -103,14 +112,11 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
         StorageAppListPageProvider.Apps,
         StorageAppListPageProvider.Games,
         ApnEditPageProvider,
-                ) + togglePermissionAppListTemplate.createPageProviders(),
-            rootPages = listOf(
-                HomePageProvider.createSettingsPage()
-            ),
     )
-    }
+
-    override val logger =
+    override val logger = if (FeatureFlagUtils.isEnabled(
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_ENABLE_SPA_METRICS))
+            context, FeatureFlagUtils.SETTINGS_ENABLE_SPA_METRICS
-            SpaLogProvider
+        )
+    ) SpaLogProvider
     else object : SpaLogger {}
 }