Merge "[flexiglass] Update the HUN drawBounds after applying the Y-offset." into main (f0492031) · Commits · e / os / android_frameworks_base

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

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -254,6 +254,17 @@ fun ContentScope.SnoozeableHeadsUpNotificationSpace(
	viewModel = viewModel,		viewModel = viewModel,
	modifier =		modifier =
	modifier		modifier
			.absoluteOffset {
			IntOffset(
			x = 0,
			y =
			calculateHeadsUpPlaceholderYOffset(
			scrollOffset.roundToInt(),
			minScrollOffset.roundToInt(),
			stackScrollView.topHeadsUpHeight,
			),
			)
			}
	.onGloballyPositioned {		.onGloballyPositioned {
	if (updateDrawBounds) {		if (updateDrawBounds) {
	stackScrollView.updateDrawBounds(		stackScrollView.updateDrawBounds(
	@@ -266,17 +277,6 @@ fun ContentScope.SnoozeableHeadsUpNotificationSpace(
	)		)
	}		}
	}		}
	.absoluteOffset {
	IntOffset(
	x = 0,
	y =
	calculateHeadsUpPlaceholderYOffset(
	scrollOffset.roundToInt(),
	minScrollOffset.roundToInt(),
	stackScrollView.topHeadsUpHeight,
	),
	)
	}
	.thenIf(isSnoozable) { Modifier.nestedScroll(snoozeScrollConnection) }		.thenIf(isSnoozable) { Modifier.nestedScroll(snoozeScrollConnection) }
	.scrollable(orientation = Orientation.Vertical, state = scrollableState),		.scrollable(orientation = Orientation.Vertical, state = scrollableState),
	)		)