diff options
| author | 2025-03-17 08:59:36 -0700 | |
|---|---|---|
| committer | 2025-03-17 08:59:36 -0700 | |
| commit | 40ed1d02b50e276edec9381f16f52faf6a37d4e1 (patch) | |
| tree | 3b20cc20e6fb53b4a1b687dea7894fd0ffc41da3 | |
| parent | 7d4ebb6addaee22ef64c72da958f50ae50e88f8c (diff) | |
| parent | 8a7e4c12d075128ce2213a6f59930de0aaebb194 (diff) | |
Merge "[Flexiglass] Use disableSwipesWhenScrolling for nested scrolling as well" into main
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index 09b8d178cc8e..3e907e87c13b 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -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() |