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

Commit 63c6864d authored by William Xiao's avatar William Xiao
Browse files

Block hub touches when shade is open 

The notification shade no longer blocks all touches from filtering down
underneath it, so we have to block touches ourselves when the shade is
open.

Bug: 323265343
Fixed: 323265343
Test: verified manually on device
Flag: ACONFIG com.android.systemui.communal_hub TEAMFOOD
Change-Id: I15eb4e681c58e5ac92b5e9f762e4d4995ac91127
parent 01b0b683

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+16 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.compose.animation.scene.transitions 
import com.android.compose.animation.scene.updateSceneTransitionLayoutState

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.ui.compose.extensions.allowGestures

import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.res.R
@@ -82,7 +81,7 @@ fun CommunalContainer( 


    SceneTransitionLayout(

        state = sceneTransitionLayoutState,

        modifier = modifier.fillMaxSize().allowGestures(allowed = touchesAllowed),

        modifier = modifier.fillMaxSize(),

        swipeSourceDetector =

            FixedSizeEdgeDetector(

                dimensionResource(id = R.dimen.communal_gesture_initiation_width)
@@ -91,9 +90,14 @@ fun CommunalContainer( 
        scene(

            CommunalScenes.Blank,

            userActions =

                if (touchesAllowed) {

                    mapOf(

                    Swipe(SwipeDirection.Left, fromSource = Edge.Right) to CommunalScenes.Communal

                        Swipe(SwipeDirection.Left, fromSource = Edge.Right) to

                            CommunalScenes.Communal

                    )

                } else {

                    emptyMap()

                }

        ) {

            // This scene shows nothing only allowing for transitions to the communal scene.

            Box(modifier = Modifier.fillMaxSize())
@@ -102,7 +106,13 @@ fun CommunalContainer( 
        scene(

            CommunalScenes.Communal,

            userActions =

                mapOf(Swipe(SwipeDirection.Right, fromSource = Edge.Left) to CommunalScenes.Blank),

                if (touchesAllowed) {

                    mapOf(

                        Swipe(SwipeDirection.Right, fromSource = Edge.Left) to CommunalScenes.Blank

                    )

                } else {

                    emptyMap()

                },

        ) {

            CommunalScene(viewModel, modifier = modifier)

        }