diff options
| author | 2025-01-09 13:44:58 -0500 | |
|---|---|---|
| committer | 2025-01-10 14:35:31 -0500 | |
| commit | 32e9ae16e21b51ddcc2708e4a6db0ed0e0386910 (patch) | |
| tree | 0cc71ca727b4242e61d408167978de70da974b7a | |
| parent | c9c0f6703c7b9f1df899feded854bb60a0da37e0 (diff) | |
[sb] parameterize the disambigation text
So we can hide it for flag roll-out. We can delete it later
Test: manual
Bug: 364360986
Flag: com.android.systemui.status_bar_root_modernization
Change-Id: I6c70a99cbc0f7f74080791ca46a232d667b59bdc
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt index f1d3b31f43a6..3c30f3cbec85 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt @@ -25,7 +25,8 @@ object StatusBarRootModernization { /** Aconfig flag for removing the fragment */ const val FLAG_NAME = Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION - const val SHOW_DISAMBIGUATION = true + /** Shows a "compose->bar" text in the status bar for debug purposes */ + const val SHOW_DISAMBIGUATION = false /** A token used for dependency declaration */ val token: FlagToken diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index 9dc283f8ac5f..b1cc208e9b43 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -144,7 +144,9 @@ fun StatusBarRoot( Box(Modifier.fillMaxSize()) { // TODO(b/364360986): remove this before rolling the flag forward - Disambiguation(viewModel = statusBarViewModel) + if (StatusBarRootModernization.SHOW_DISAMBIGUATION) { + Disambiguation(viewModel = statusBarViewModel) + } Row(Modifier.fillMaxSize()) { val scope = rememberCoroutineScope() |