From 2f346f41a707e6e01048c5ef08c95416b8023c15 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 15 Feb 2023 14:55:11 +0800 Subject: [PATCH] Add IS_DEBUG to SpaEnvironment If set to true, this will also enable all the pages under development (allows browsing and searching). Bug: 244122804 Test: Manually with Settings Change-Id: Ibf8f6f832f7f9f16e8224a83b92801635a83e1cb --- .../settingslib/spa/framework/common/SettingsPage.kt | 5 ++--- .../settingslib/spa/framework/common/SpaEnvironment.kt | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPage.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPage.kt index 724588f794b46..3fdb1d14e667c 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPage.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPage.kt @@ -77,9 +77,8 @@ data class SettingsPage( return true } - fun isEnabled(): Boolean { - return getPageProvider(sppName)?.isEnabled(arguments) ?: false - } + fun isEnabled(): Boolean = + SpaEnvironment.IS_DEBUG || getPageProvider(sppName)?.isEnabled(arguments) ?: false fun getTitle(): String { return getPageProvider(sppName)?.getTitle(arguments) ?: "" diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt index 02962a5815a25..2d956d5eddb20 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt @@ -88,4 +88,13 @@ abstract class SpaEnvironment(context: Context) { open val sliceProviderAuthorities: String? = null // TODO: add other environment setup here. + companion object { + /** + * Whether debug mode is on or off. + * + * If set to true, this will also enable all the pages under development (allows browsing + * and searching). + */ + const val IS_DEBUG = false + } }