From 546d49c3dfa655720c92ef36889e868b4f4135de Mon Sep 17 00:00:00 2001 From: Steven Lee Date: Wed, 21 Dec 2022 14:46:22 +0800 Subject: [PATCH] Make toggle permission provider list in SettingsSpaEnvironment extendable. Legal tracker bug: 262937731 Privacy tracker bug: 262936913 UX tracker bug: 262938050 Bug: 259436697 Bug: 263163538 Test: Settings builds. Change-Id: Ida26f11b101d49375bad85380458b018060d9fec --- .../settings/spa/SettingsSpaEnvironment.kt | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt index b4b4d6e09b5..55ea0c95861 100644 --- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt +++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt @@ -41,24 +41,27 @@ import com.android.settings.spa.system.SystemMainPageProvider import com.android.settingslib.spa.framework.common.SettingsPage import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository import com.android.settingslib.spa.framework.common.SpaEnvironment +import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) { + open fun getTogglePermissionAppListProviders(): List { + return listOf( + AllFilesAccessAppListProvider, + DisplayOverOtherAppsAppListProvider, + MediaManagementAppsAppListProvider, + ModifySystemSettingsAppListProvider, + PictureInPictureListProvider, + InstallUnknownAppsListProvider, + AlarmsAndRemindersAppListProvider, + WifiControlAppListProvider, + ) + } + override val pageProviderRepository = lazy { - val togglePermissionAppListTemplate = - TogglePermissionAppListTemplate( - allProviders = - listOf( - AllFilesAccessAppListProvider, - DisplayOverOtherAppsAppListProvider, - MediaManagementAppsAppListProvider, - ModifySystemSettingsAppListProvider, - PictureInPictureListProvider, - InstallUnknownAppsListProvider, - AlarmsAndRemindersAppListProvider, - WifiControlAppListProvider, - ), - ) + val togglePermissionAppListTemplate = TogglePermissionAppListTemplate( + allProviders = getTogglePermissionAppListProviders() + ) SettingsPageProviderRepository( allPageProviders = listOf( HomePageProvider,