From 2c89f0465e2e810eeca8cb2f78c36244f0b3bc3c Mon Sep 17 00:00:00 2001 From: Zekan Qian Date: Tue, 31 Jan 2023 11:27:22 +0800 Subject: [PATCH] Add more debug information. Add page's isEnabled data in DebugActivity Add entry's attribution data in DebugActivity Bug: 244122804 Test: unit-test & local build gallery Change-Id: I1abd0ec87a44d947599e21185dd0c7a63f4ab0af --- .../src/com/android/settingslib/spa/debug/DebugActivity.kt | 1 + .../spa/src/com/android/settingslib/spa/debug/DebugFormat.kt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugActivity.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugActivity.kt index 72f662ff7d081..078c925783fae 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugActivity.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugActivity.kt @@ -175,6 +175,7 @@ class DebugActivity : ComponentActivity() { RegularScaffold(title = "Page - ${page.debugBrief()}") { Text(text = "id = ${page.id}") Text(text = page.debugArguments()) + Text(text = "enabled = ${page.isEnabled()}") Text(text = "Entry size: ${pageWithEntry.entries.size}") Preference(model = object : PreferenceModel { override val title = "open page" diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugFormat.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugFormat.kt index 6ecf9c39c9fae..d95ed05e560de 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugFormat.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/debug/DebugFormat.kt @@ -66,6 +66,11 @@ fun SettingsEntry.debugContent(entryRepository: SettingsEntryRepository): String "linkFrom = ${fromPage?.debugBrief()} ${fromPage?.debugArguments()}", "linkTo = ${toPage?.debugBrief()} ${toPage?.debugArguments()}", "hierarchy_path = $entryPathWithName", + "------ ATTRIBUTION ------", + "allowSearch = $isAllowSearch", + "isSearchDynamic = $isSearchDataDynamic", + "isSearchMutable = $hasMutableStatus", + "hasSlice = $hasSliceSupport", "------ SEARCH ------", "search_path = $entryPathWithTitle", searchData?.debugContent() ?: "no search data",