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

This commit is contained in:
Charlotte Lu
2023-11-13 07:54:16 +00:00
committed by Android (Google) Code Review

View File

@@ -82,35 +82,41 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
allProviders = getTogglePermissionAppListProviders() allProviders = getTogglePermissionAppListProviders()
) )
SettingsPageProviderRepository( SettingsPageProviderRepository(
allPageProviders = listOf( allPageProviders = settingsPageProviders()
HomePageProvider, + togglePermissionAppListTemplate.createPageProviders(),
AppsMainPageProvider,
AllAppListPageProvider,
AppInfoSettingsProvider,
SpecialAppAccessPageProvider,
NotificationMainPageProvider,
AppListNotificationsPageProvider,
SystemMainPageProvider,
LanguageAndInputPageProvider,
AppLanguagesPageProvider,
UsageStatsPageProvider,
PlatformCompatAppListPageProvider,
BackgroundInstalledAppsPageProvider,
UserAspectRatioAppsPageProvider,
CloneAppInfoSettingsProvider,
NetworkAndInternetPageProvider,
AboutPhonePageProvider,
StorageAppListPageProvider.Apps,
StorageAppListPageProvider.Games,
ApnEditPageProvider,
) + togglePermissionAppListTemplate.createPageProviders(),
rootPages = listOf( rootPages = listOf(
HomePageProvider.createSettingsPage() HomePageProvider.createSettingsPage()
), ),
) )
} }
override val logger =
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_ENABLE_SPA_METRICS))
SpaLogProvider open fun settingsPageProviders() = listOf(
else object : SpaLogger {} HomePageProvider,
AppsMainPageProvider,
AllAppListPageProvider,
AppInfoSettingsProvider,
SpecialAppAccessPageProvider,
NotificationMainPageProvider,
AppListNotificationsPageProvider,
SystemMainPageProvider,
LanguageAndInputPageProvider,
AppLanguagesPageProvider,
UsageStatsPageProvider,
PlatformCompatAppListPageProvider,
BackgroundInstalledAppsPageProvider,
UserAspectRatioAppsPageProvider,
CloneAppInfoSettingsProvider,
NetworkAndInternetPageProvider,
AboutPhonePageProvider,
StorageAppListPageProvider.Apps,
StorageAppListPageProvider.Games,
ApnEditPageProvider,
)
override val logger = if (FeatureFlagUtils.isEnabled(
context, FeatureFlagUtils.SETTINGS_ENABLE_SPA_METRICS
)
) SpaLogProvider
else object : SpaLogger {}
} }