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

Commit 73930286 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Stop edit mode if the shade is closed 

Due to always compose, closing the shade would not cause edit mode to
stop (as it was not removed from the composition). Instead, do it
manually.

Test: manual, fold with edit mode open
Fixes: 406667719
Fixes: 407965426
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Change-Id: I08ad2a208410bb8e5284ce04e75c50d9c9aa397f
parent 4d9fc173

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+19 −5
Original line number Diff line number Diff line
@@ -344,12 +344,26 @@ constructor( 
            )



        LaunchedEffect(Unit) {

            launch {

                synchronizeQsState(

                    sceneState,

                    viewModel.containerViewModel.editModeViewModel.isEditing,

                    snapshotFlow { viewModel.expansionState }.map { it.progress },

                )

            }

            if (alwaysCompose) {

                // Normally, the Edit mode will stop if the composable leaves, but if the shade

                // is closed, because we are always composed, we don't stop edit mode.

                launch {

                    snapshotFlow { viewModel.isQsVisibleAndAnyShadeExpanded }

                        .collect {

                            if (!it) {

                                viewModel.containerViewModel.editModeViewModel.stopEditing()

                            }

                        }

                }

            }

        }



        SceneTransitionLayout(state = sceneState, modifier = Modifier.fillMaxSize()) {

            scene(QuickSettings, alwaysCompose = alwaysCompose) {