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

Commit 40ed1d02 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] Use disableSwipesWhenScrolling for nested scrolling as well" into main

parents 7d4ebb6a 8a7e4c12

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

+2 −2
Original line number Diff line number Diff line
@@ -574,11 +574,11 @@ fun ContentScope.NotificationScrollingStack( 
        ) {

            Column(

                modifier =

                    Modifier.thenIf(supportNestedScrolling) {

                    Modifier.disableSwipesWhenScrolling(NestedScrollableBound.BottomRight)

                        .thenIf(supportNestedScrolling) {

                            Modifier.nestedScroll(scrimNestedScrollConnection)

                        }

                        .stackVerticalOverscroll(coroutineScope) { scrollState.canScrollForward }

                        .disableSwipesWhenScrolling(NestedScrollableBound.BottomRight)

                        .verticalScroll(scrollState)

                        .padding(top = stackTopPadding, bottom = stackBottomPadding)

                        .fillMaxWidth()