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

Commit 32e9ae16 authored by Evan Laird's avatar Evan Laird
Browse files

[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
parent c9c0f670

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt

+2 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt

+3 −1
Original line number Diff line number Diff line
@@ -144,7 +144,9 @@ fun StatusBarRoot( 


    Box(Modifier.fillMaxSize()) {

        // TODO(b/364360986): remove this before rolling the flag forward

        if (StatusBarRootModernization.SHOW_DISAMBIGUATION) {

            Disambiguation(viewModel = statusBarViewModel)

        }



        Row(Modifier.fillMaxSize()) {

            val scope = rememberCoroutineScope()