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

Commit d42cc85c authored by András Kurucz's avatar András Kurucz
Browse files

[Flexiglass] disableScrollWhileSwipe on the notif stack for any bounds 

The top bounds were ignored for this check before, but we actually want
to use it for both directions of swipe gestures.

Bug: 416342077
Test: check the if swipes are disabled while scrolls
       - open single shade
       - scroll up notifications a bit (finish the gesture)
       - scroll down notifications, scroll over when they reach top
       - Test: we don't transition to quick settings
Flag: com.android.systemui.scene_container

Change-Id: I82778a6145dda158fcc8e45513f39f4627433ff2
parent 2e9dcd82

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ import com.android.compose.animation.scene.ElementKey 
import com.android.compose.animation.scene.LowestZIndexContentPicker

import com.android.compose.animation.scene.SceneTransitionLayoutState

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.gesture.NestedScrollableBound

import com.android.compose.gesture.effect.OffsetOverscrollEffect

import com.android.compose.gesture.effect.rememberOffsetOverscrollEffect

import com.android.compose.modifiers.thenIf
@@ -596,7 +595,7 @@ fun ContentScope.NotificationScrollingStack( 
        ) {

            Column(

                modifier =

                    Modifier.disableSwipesWhenScrolling(NestedScrollableBound.BottomRight)

                    Modifier.disableSwipesWhenScrolling()

                        .thenIf(supportNestedScrolling) {

                            Modifier.nestedScroll(scrimNestedScrollConnection)

                        }