Move all debug message to debug/ folder. (5a0d15fd) · Commits · e / os / android_frameworks_base

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

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -22,12 +22,4 @@ package com.android.settingslib.spa.framework.common
	data class EntrySearchData(		data class EntrySearchData(
	val title: String = "",		val title: String = "",
	val keyword: List<String> = emptyList(),		val keyword: List<String> = emptyList(),
	) {
	fun format(): String {
	val content = listOf(
	"search_title = $title",
	"search_keyword = $keyword",
	)		)
	return content.joinToString("\n")
	}
	}

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -99,10 +99,6 @@ data class SettingsEntry(
	*/		*/
	private val uiLayoutImpl: (@Composable (arguments: Bundle?) -> Unit) = {},		private val uiLayoutImpl: (@Composable (arguments: Bundle?) -> Unit) = {},
	) {		) {
	fun displayTitle(): String {
	return "${owner.displayName}:$displayName"
	}

	fun containerPage(): SettingsPage {		fun containerPage(): SettingsPage {
	// The Container page of the entry, which is the from-page or		// The Container page of the entry, which is the from-page or
	// the owner-page if from-page is unset.		// the owner-page if from-page is unset.

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

+2 −12

Original line number	Original line	Diff line number	Diff line
	@@ -84,16 +84,6 @@ data class SettingsPage(
	return sppName == SppName		return sppName == SppName
	}		}

	fun formatArguments(): String {
	val normArguments = parameter.normalize(arguments)
	if (normArguments == null \|\| normArguments.isEmpty) return "[No arguments]"
	return normArguments.toString().removeRange(0, 6)
	}

	fun formatDisplayTitle(): String {
	return "$displayName ${formatArguments()}"
	}

	fun buildRoute(): String {		fun buildRoute(): String {
	return sppName + parameter.navLink(arguments)		return sppName + parameter.navLink(arguments)
	}		}
	@@ -115,7 +105,7 @@ data class SettingsPage(
	id,		id,
	LogEvent.PAGE_ENTER,		LogEvent.PAGE_ENTER,
	category = LogCategory.FRAMEWORK,		category = LogCategory.FRAMEWORK,
	details = formatDisplayTitle()		details = displayName,
	)		)
	}		}

	@@ -124,7 +114,7 @@ data class SettingsPage(
	id,		id,
	LogEvent.PAGE_LEAVE,		LogEvent.PAGE_LEAVE,
	category = LogCategory.FRAMEWORK,		category = LogCategory.FRAMEWORK,
	details = formatDisplayTitle()		details = displayName,
	)		)
	}		}

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/debug/DebugActivity.kt

+12 −13

Original line number	Original line	Diff line number	Diff line
	@@ -120,12 +120,11 @@ class DebugActivity : ComponentActivity() {
	val allPageWithEntry = remember { entryRepository.getAllPageWithEntry() }		val allPageWithEntry = remember { entryRepository.getAllPageWithEntry() }
	RegularScaffold(title = "All Pages (${allPageWithEntry.size})") {		RegularScaffold(title = "All Pages (${allPageWithEntry.size})") {
	for (pageWithEntry in allPageWithEntry) {		for (pageWithEntry in allPageWithEntry) {
			val page = pageWithEntry.page
	Preference(object : PreferenceModel {		Preference(object : PreferenceModel {
	override val title =		override val title = "${page.debugBrief()} (${pageWithEntry.entries.size})"
	"${pageWithEntry.page.displayName} (${pageWithEntry.entries.size})"		override val summary = page.debugArguments().toState()
	override val summary = pageWithEntry.page.formatArguments().toState()		override val onClick = navigator(route = ROUTE_PAGE + "/${page.id}")
	override val onClick =
	navigator(route = ROUTE_PAGE + "/${pageWithEntry.page.id}")
	})		})
	}		}
	}		}
	@@ -146,16 +145,16 @@ class DebugActivity : ComponentActivity() {
	val entryRepository by spaEnvironment.entryRepository		val entryRepository by spaEnvironment.entryRepository
	val id = arguments!!.getString(PARAM_NAME_PAGE_ID, "")		val id = arguments!!.getString(PARAM_NAME_PAGE_ID, "")
	val pageWithEntry = entryRepository.getPageWithEntry(id)!!		val pageWithEntry = entryRepository.getPageWithEntry(id)!!
	RegularScaffold(title = "Page - ${pageWithEntry.page.displayName}") {		val page = pageWithEntry.page
	Text(text = "id = ${pageWithEntry.page.id}")		RegularScaffold(title = "Page - ${page.debugBrief()}") {
	Text(text = pageWithEntry.page.formatArguments())		Text(text = "id = ${page.id}")
			Text(text = page.debugArguments())
	Text(text = "Entry size: ${pageWithEntry.entries.size}")		Text(text = "Entry size: ${pageWithEntry.entries.size}")
	Preference(model = object : PreferenceModel {		Preference(model = object : PreferenceModel {
	override val title = "open page"		override val title = "open page"
	override val enabled =		override val enabled =
	pageWithEntry.page.isBrowsable(context, spaEnvironment.browseActivityClass)		page.isBrowsable(context, spaEnvironment.browseActivityClass).toState()
	.toState()		override val onClick = openPage(page)
	override val onClick = openPage(pageWithEntry.page)
	})		})
	EntryList(pageWithEntry.entries)		EntryList(pageWithEntry.entries)
	}		}
	@@ -168,7 +167,7 @@ class DebugActivity : ComponentActivity() {
	val id = arguments!!.getString(PARAM_NAME_ENTRY_ID, "")		val id = arguments!!.getString(PARAM_NAME_ENTRY_ID, "")
	val entry = entryRepository.getEntry(id)!!		val entry = entryRepository.getEntry(id)!!
	val entryContent = remember { entry.debugContent(entryRepository) }		val entryContent = remember { entry.debugContent(entryRepository) }
	RegularScaffold(title = "Entry - ${entry.displayTitle()}") {		RegularScaffold(title = "Entry - ${entry.debugBrief()}") {
	Preference(model = object : PreferenceModel {		Preference(model = object : PreferenceModel {
	override val title = "open entry"		override val title = "open entry"
	override val enabled =		override val enabled =
	@@ -184,7 +183,7 @@ class DebugActivity : ComponentActivity() {
	private fun EntryList(entries: Collection<SettingsEntry>) {		private fun EntryList(entries: Collection<SettingsEntry>) {
	for (entry in entries) {		for (entry in entries) {
	Preference(object : PreferenceModel {		Preference(object : PreferenceModel {
	override val title = entry.displayTitle()		override val title = entry.debugBrief()
	override val summary =		override val summary =
	"${entry.fromPage?.displayName} -> ${entry.toPage?.displayName}".toState()		"${entry.fromPage?.displayName} -> ${entry.toPage?.displayName}".toState()
	override val onClick = navigator(route = ROUTE_ENTRY + "/${entry.id}")		override val onClick = navigator(route = ROUTE_ENTRY + "/${entry.id}")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/debug/DebugFormat.kt

+31 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,22 @@

	package com.android.settingslib.spa.framework.debug		package com.android.settingslib.spa.framework.debug

			import com.android.settingslib.spa.framework.common.EntrySearchData
	import com.android.settingslib.spa.framework.common.EntryStatusData		import com.android.settingslib.spa.framework.common.EntryStatusData
	import com.android.settingslib.spa.framework.common.SettingsEntry		import com.android.settingslib.spa.framework.common.SettingsEntry
	import com.android.settingslib.spa.framework.common.SettingsEntryRepository		import com.android.settingslib.spa.framework.common.SettingsEntryRepository
			import com.android.settingslib.spa.framework.common.SettingsPage
			import com.android.settingslib.spa.framework.util.normalize

	fun EntryStatusData.debugContent(): String {		private fun EntrySearchData.debugContent(): String {
			val content = listOf(
			"search_title = $title",
			"search_keyword = $keyword",
			)
			return content.joinToString("\n")
			}

			private fun EntryStatusData.debugContent(): String {
	val content = listOf(		val content = listOf(
	"is_disabled = $isDisabled",		"is_disabled = $isDisabled",
	"is_switch_off = $isSwitchOff",		"is_switch_off = $isSwitchOff",
	@@ -28,6 +39,20 @@ fun EntryStatusData.debugContent(): String {
	return content.joinToString("\n")		return content.joinToString("\n")
	}		}

			fun SettingsPage.debugArguments(): String {
			val normArguments = parameter.normalize(arguments)
			if (normArguments == null \|\| normArguments.isEmpty) return "[No arguments]"
			return normArguments.toString().removeRange(0, 6)
			}

			fun SettingsPage.debugBrief(): String {
			return displayName
			}

			fun SettingsEntry.debugBrief(): String {
			return "${owner.displayName}:$displayName"
			}

	fun SettingsEntry.debugContent(entryRepository: SettingsEntryRepository): String {		fun SettingsEntry.debugContent(entryRepository: SettingsEntryRepository): String {
	val searchData = getSearchData()		val searchData = getSearchData()
	val statusData = getStatusData()		val statusData = getStatusData()
	@@ -37,14 +62,14 @@ fun SettingsEntry.debugContent(entryRepository: SettingsEntryRepository): String
	val content = listOf(		val content = listOf(
	"------ STATIC ------",		"------ STATIC ------",
	"id = $id",		"id = $id",
	"owner = ${owner.formatDisplayTitle()}",		"owner = ${owner.debugBrief()} ${owner.debugArguments()}",
	"linkFrom = ${fromPage?.formatDisplayTitle()}",		"linkFrom = ${fromPage?.debugBrief()} ${fromPage?.debugArguments()}",
	"linkTo = ${toPage?.formatDisplayTitle()}",		"linkTo = ${toPage?.debugBrief()} ${toPage?.debugArguments()}",
	"hierarchy_path = $entryPathWithName",		"hierarchy_path = $entryPathWithName",
	"------ SEARCH ------",		"------ SEARCH ------",
	"search_path = $entryPathWithTitle",		"search_path = $entryPathWithTitle",
	"${searchData?.format()}",		searchData?.debugContent() ?: "no search data",
	"${statusData?.debugContent()}"		statusData?.debugContent() ?: "no status data",
	)		)
	return content.joinToString("\n")		return content.joinToString("\n")
	}		}