Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 181119f0 authored by Yilin Cai's avatar Yilin Cai Committed by Android (Google) Code Review
Browse files

Merge "Add mapping to the WiFi-control SPA page in Settings app."

parents c1f72222 772f3b37

src/com/android/settings/SettingsActivityUtil.kt

+5 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/applications/manageapplications/ManageApplicationsUtil.kt

+2 −0
Original line number Diff line number Diff line
@@ -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