From 772f3b370ba55d41faec79842433aa4b7b7f0e9d Mon Sep 17 00:00:00 2001 From: Yilin Cai Date: Wed, 4 Jan 2023 17:35:30 +0800 Subject: [PATCH] Add mapping to the WiFi-control SPA page in Settings app. Test: local device + logcat Bug: 262206181 Change-Id: Iafa2851a5a7c8770fc1b15cdfefaf37a17d55750 --- src/com/android/settings/SettingsActivityUtil.kt | 6 +++++- .../manageapplications/ManageApplicationsUtil.kt | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/SettingsActivityUtil.kt b/src/com/android/settings/SettingsActivityUtil.kt index c673ad9861f..cac341fff02 100644 --- a/src/com/android/settings/SettingsActivityUtil.kt +++ b/src/com/android/settings/SettingsActivityUtil.kt @@ -36,6 +36,8 @@ import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider import com.android.settings.spa.app.specialaccess.MediaManagementAppsAppListProvider import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider +import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider +import com.android.settings.wifi.ChangeWifiStateDetails object SettingsActivityUtil { private val FRAGMENT_TO_SPA_DESTINATION_MAP = mapOf( @@ -58,6 +60,8 @@ object SettingsActivityUtil { AllFilesAccessAppListProvider.getAppInfoRoutePrefix(), MediaManagementAppsDetails::class.qualifiedName to MediaManagementAppsAppListProvider.getAppInfoRoutePrefix(), + ChangeWifiStateDetails::class.qualifiedName to + WifiControlAppListProvider.getAppInfoRoutePrefix(), ) @JvmStatic @@ -75,4 +79,4 @@ object SettingsActivityUtil { } return false } -} \ No newline at end of file +} diff --git a/src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt b/src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt index c869fc5ec7a..8c4c41dfd05 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt +++ b/src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt @@ -59,6 +59,7 @@ import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListPro import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider import com.android.settings.spa.app.specialaccess.MediaManagementAppsAppListProvider import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider +import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider import com.android.settings.spa.notification.AppListNotificationsPageProvider import com.android.settings.spa.system.AppLanguagesPageProvider @@ -101,6 +102,7 @@ object ManageApplicationsUtil { LIST_MANAGE_EXTERNAL_STORAGE -> AllFilesAccessAppListProvider.getAppListRoute() LIST_TYPE_MEDIA_MANAGEMENT_APPS -> MediaManagementAppsAppListProvider.getAppListRoute() LIST_TYPE_ALARMS_AND_REMINDERS -> AlarmsAndRemindersAppListProvider.getAppListRoute() + LIST_TYPE_WIFI_ACCESS -> WifiControlAppListProvider.getAppListRoute() LIST_TYPE_NOTIFICATION -> AppListNotificationsPageProvider.name LIST_TYPE_APPS_LOCALE -> AppLanguagesPageProvider.name LIST_TYPE_MAIN -> AllAppListPageProvider.name