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

Commit 12d68eea authored Feb 28, 2023 by Chaohui Wang Committed by Automerger Merge Worker Feb 28, 2023

Merge "Add IS_DEBUG to SpaEnvironment" into udc-dev am: e58cc567

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21472726

Change-Id: Ibe0a5ef78cfeb2c5d5c74bd6f7ac37ceb23a0bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 4e762c22 e58cc567

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPage.kt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -77,9 +77,8 @@ data class SettingsPage(
	return true		return true
	}		}

	fun isEnabled(): Boolean {		fun isEnabled(): Boolean =
	return getPageProvider(sppName)?.isEnabled(arguments) ?: false		SpaEnvironment.IS_DEBUG \|\| getPageProvider(sppName)?.isEnabled(arguments) ?: false
	}

	fun getTitle(): String {		fun getTitle(): String {
	return getPageProvider(sppName)?.getTitle(arguments) ?: ""		return getPageProvider(sppName)?.getTitle(arguments) ?: ""

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,4 +88,13 @@ abstract class SpaEnvironment(context: Context) {
	open val sliceProviderAuthorities: String? = null		open val sliceProviderAuthorities: String? = null

	// TODO: add other environment setup here.		// 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
			}
	}		}