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

Commit 539679cd authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Revert setting alwaysCompose for QS scenes and overlays" into main

parents 6f8d213f 693e0e32

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ constructor( 


    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override val alwaysCompose: Boolean = true

    override val alwaysCompose: Boolean = false



    override suspend fun onActivated(): Nothing {

        actionsViewModel.activate()

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeOverlay.kt

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ constructor( 


    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override val alwaysCompose: Boolean = true

    override val alwaysCompose: Boolean = false



    override suspend fun activate(): Nothing {

        actionsViewModel.activate()