From f37d638458f3b86240fff13b86bb27f56f22b5fc Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 15 Feb 2023 14:58:28 +0800 Subject: [PATCH] Disable the middle pages during development Set isEnabled to false will prevent these middle pages which under development get accidentally displayed to users. During development, please flip isEnabled() of each page to true or flip SpaEnvironment.IS_DEBUG to true to test these pages. Bug: 244122804 Test: Manually with Settings Change-Id: I5c3f835cfa3457b711d224ca37aa5d2b9a248feb --- src/com/android/settings/spa/app/AppsMain.kt | 4 ++-- .../settings/spa/app/specialaccess/SpecialAppAccess.kt | 2 ++ src/com/android/settings/spa/home/HomePage.kt | 2 ++ src/com/android/settings/spa/network/NetworkAndInternet.kt | 3 ++- src/com/android/settings/spa/notification/NotificationMain.kt | 2 ++ .../settings/spa/system/LanguageAndInputPageProvider.kt | 2 ++ src/com/android/settings/spa/system/SystemMain.kt | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/spa/app/AppsMain.kt b/src/com/android/settings/spa/app/AppsMain.kt index e9eca1fd015..2dea9c5c977 100644 --- a/src/com/android/settings/spa/app/AppsMain.kt +++ b/src/com/android/settings/spa/app/AppsMain.kt @@ -24,10 +24,8 @@ import androidx.compose.ui.res.stringResource import com.android.settings.R import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider -import com.android.settings.spa.home.HomePageProvider import com.android.settingslib.spa.framework.common.SettingsEntry import com.android.settingslib.spa.framework.common.SettingsEntryBuilder -import com.android.settingslib.spa.framework.common.SettingsPage import com.android.settingslib.spa.framework.common.SettingsPageProvider import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory import com.android.settingslib.spa.framework.common.createSettingsPage @@ -42,6 +40,8 @@ object AppsMainPageProvider : SettingsPageProvider { override val name = "AppsMain" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { RegularScaffold(title = getTitle(arguments)) { diff --git a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt index 7763a390f64..b40e32b3afb 100644 --- a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt +++ b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt @@ -33,6 +33,8 @@ object SpecialAppAccessPageProvider : SettingsPageProvider { override val name = "SpecialAppAccess" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { RegularScaffold(title = stringResource(R.string.special_access)) { diff --git a/src/com/android/settings/spa/home/HomePage.kt b/src/com/android/settings/spa/home/HomePage.kt index d2416f44a0d..c0dd1389cf5 100644 --- a/src/com/android/settings/spa/home/HomePage.kt +++ b/src/com/android/settings/spa/home/HomePage.kt @@ -31,6 +31,8 @@ object HomePageProvider : SettingsPageProvider { override val name = "Home" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + override fun buildEntry(arguments: Bundle?): List { return listOf( diff --git a/src/com/android/settings/spa/network/NetworkAndInternet.kt b/src/com/android/settings/spa/network/NetworkAndInternet.kt index 9a3770e3120..777133e666b 100644 --- a/src/com/android/settings/spa/network/NetworkAndInternet.kt +++ b/src/com/android/settings/spa/network/NetworkAndInternet.kt @@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import com.android.settings.R -import com.android.settings.spa.network.AirplaneModePreference import com.android.settingslib.RestrictedLockUtilsInternal import com.android.settingslib.Utils import com.android.settingslib.spa.framework.common.SettingsEntryBuilder @@ -45,6 +44,8 @@ object NetworkAndInternetPageProvider : SettingsPageProvider { override val name = "NetworkAndInternet" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { RegularScaffold(title = getTitle(arguments)) { diff --git a/src/com/android/settings/spa/notification/NotificationMain.kt b/src/com/android/settings/spa/notification/NotificationMain.kt index 2324dd85996..305f2015285 100644 --- a/src/com/android/settings/spa/notification/NotificationMain.kt +++ b/src/com/android/settings/spa/notification/NotificationMain.kt @@ -37,6 +37,8 @@ object NotificationMainPageProvider : SettingsPageProvider { override val name = "NotificationMain" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { RegularScaffold(title = getTitle(arguments)) { diff --git a/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt b/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt index 06fe3927f01..b5cd2997589 100644 --- a/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt +++ b/src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt @@ -33,6 +33,8 @@ import com.android.settingslib.spa.widget.ui.SettingsIcon object LanguageAndInputPageProvider : SettingsPageProvider { override val name = "LanguageAndInput" + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { LanguageAndInput() diff --git a/src/com/android/settings/spa/system/SystemMain.kt b/src/com/android/settings/spa/system/SystemMain.kt index 6e07a197d5b..04ae51209a8 100644 --- a/src/com/android/settings/spa/system/SystemMain.kt +++ b/src/com/android/settings/spa/system/SystemMain.kt @@ -37,6 +37,8 @@ object SystemMainPageProvider : SettingsPageProvider { override val name = "SystemMain" private val owner = createSettingsPage() + override fun isEnabled(arguments: Bundle?) = false + @Composable override fun Page(arguments: Bundle?) { RegularScaffold(title = getTitle(arguments)) {