Merge "Shade should collapse when drag gesture begins on the bottom boundary" into main (ef74fc97) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ 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.modifiers.thenIf
		import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadius
		import com.android.systemui.res.R
		@@ -579,6 +580,7 @@ fun ContentScope.NotificationScrollingStack(
		Modifier.nestedScroll(scrimNestedScrollConnection)
		}
		.stackVerticalOverscroll(coroutineScope) { scrollState.canScrollForward }
		.disableSwipesWhenScrolling(NestedScrollableBound.BottomRight)
		.verticalScroll(scrollState)
		.padding(top = stackTopPadding, bottom = stackBottomPadding)
		.fillMaxWidth()