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

Commit 1eb4fff8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] disableScrollWhileSwipe on the notif stack for any bounds" into main

parents 0ac0a89c d42cc85c

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)

                        }