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

Commit dc866029 authored by Justin Weir's avatar Justin Weir
Browse files

Force shade collapse instead of scroll on swipes from bottom 

Switching to clickable prevents any possibility for motion events to
dispatch to the scrollable view by mistake.

Fixes: 369656661
Test: Ran failing E2E tests, e.g. DragDownNotificationShade
Flag: com.android.systemui.scene_container
Change-Id: Ia8187b7d90c20ee41499829dccd054146ffdcdcb
parent ac81468f

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.CompositingStrategy

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.input.pointer.pointerInteropFilter

import androidx.compose.ui.layout.Layout

import androidx.compose.ui.layout.layoutId

import androidx.compose.ui.platform.LocalContext
@@ -403,7 +402,8 @@ private fun SceneScope.SingleShade( 
            modifier =

                Modifier.align(Alignment.BottomCenter)

                    .height(navBarHeight)

                    .pointerInteropFilter { true }

                    // Intercepts touches, prevents the scrollable container behind from scrolling.

                    .clickable(interactionSource = null, indication = null) { /* do nothing */ }

                    .verticalNestedScrollToScene(

                        topBehavior = NestedScrollBehavior.EdgeAlways,

                        isExternalOverscrollGesture = { false },