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

Commit 3d0179ca authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Add more conditions to excluding gesture" into main

parents 5116398d c277a107

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

+10 −1
Original line number Diff line number Diff line
@@ -746,7 +746,16 @@ constructor( 
                                Box(

                                    Modifier.systemGestureExclusionInShade(

                                        enabled = {

                                            layoutState.transitionState is TransitionState.Idle

                                            /*

                                             * While we are transitioning into QS (either from QQS

                                             * or from gone), the global position of the brightness

                                             * slider will change in every frame. This causes

                                             * the modifier to send a new gesture exclusion

                                             * rectangle on every frame. Instead, only apply the

                                             * modifier when this is settled.

                                             */

                                            layoutState.transitionState is TransitionState.Idle &&

                                                viewModel.isNotTransitioning

                                        }

                                    )

                                ) {

packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt

+5 −0
Original line number Diff line number Diff line
@@ -312,6 +312,11 @@ constructor( 
            source = containerViewModel.editModeViewModel.isEditing,

        )



    /** True if we are not in an expansion (from Gone to QQS/QS) animation. */

    val isNotTransitioning by derivedStateOf {

        viewTranslationY == 0f && viewAlpha == 1f && constrainedSquishinessFraction == 1f

    }



    private val inFirstPage: Boolean

        get() = inFirstPageViewModel.inFirstPage