Merge "[flexiglass] fix shared element transition for Notification Placeholder... (5de6a97a) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -401,10 +401,10 @@ private fun SceneScope.NotificationPlaceholder(
	viewModel: NotificationsPlaceholderViewModel,		viewModel: NotificationsPlaceholderViewModel,
	modifier: Modifier = Modifier,		modifier: Modifier = Modifier,
	) {		) {
	Element(		Box(
	Notifications.Elements.NotificationStackPlaceholder,
	modifier =		modifier =
	modifier		modifier
			.element(Notifications.Elements.NotificationStackPlaceholder)
	.debugBackground(viewModel, DEBUG_STACK_COLOR)		.debugBackground(viewModel, DEBUG_STACK_COLOR)
	.onSizeChanged { size -> debugLog(viewModel) { "STACK onSizeChanged: size=$size" } }		.onSizeChanged { size -> debugLog(viewModel) { "STACK onSizeChanged: size=$size" } }
	.onGloballyPositioned { coordinates: LayoutCoordinates ->		.onGloballyPositioned { coordinates: LayoutCoordinates ->
	@@ -419,9 +419,7 @@ private fun SceneScope.NotificationPlaceholder(
	stackScrollView.setStackTop(positionInWindow.y)		stackScrollView.setStackTop(positionInWindow.y)
	stackScrollView.setStackBottom(positionInWindow.y + coordinates.size.height)		stackScrollView.setStackBottom(positionInWindow.y + coordinates.size.height)
	}		}
	) {		)
	content {}
	}
	}		}

	private fun calculateCornerRadius(		private fun calculateCornerRadius(

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -103,11 +103,12 @@ val SceneContainerTransitions = transitions {
	overscroll(Scenes.Shade, Orientation.Vertical) {		overscroll(Scenes.Shade, Orientation.Vertical) {
	translate(		translate(
	Notifications.Elements.NotificationScrim,		Notifications.Elements.NotificationScrim,
	y = { Shade.Dimensions.ScrimOverscrollLimit }		y = Shade.Dimensions.ScrimOverscrollLimit
	)		)
			translate(Shade.Elements.SplitShadeStartColumn, y = Shade.Dimensions.ScrimOverscrollLimit)
	translate(		translate(
	Shade.Elements.SplitShadeStartColumn,		Notifications.Elements.NotificationStackPlaceholder,
	y = { Shade.Dimensions.ScrimOverscrollLimit }		y = Shade.Dimensions.ScrimOverscrollLimit,
	)		)
	}		}
	overscroll(Scenes.NotificationsShade, Orientation.Vertical) {		overscroll(Scenes.NotificationsShade, Orientation.Vertical) {

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,7 @@ object Shade {
	object Dimensions {		object Dimensions {
	val ScrimCornerSize = 32.dp		val ScrimCornerSize = 32.dp
	val HorizontalPadding = 16.dp		val HorizontalPadding = 16.dp
	const val ScrimOverscrollLimit = 100f		val ScrimOverscrollLimit = 32.dp
	const val ScrimVisibilityThreshold = 5f		const val ScrimVisibilityThreshold = 5f
	}		}

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,11 @@ constructor(
	(transitionState.fromScene in SceneFamilies.NotifShade &&		(transitionState.fromScene in SceneFamilies.NotifShade &&
	transitionState.toScene == quickSettingsScene) \|\|		transitionState.toScene == quickSettingsScene) \|\|
	(transitionState.fromScene in quickSettingsScene &&		(transitionState.fromScene in quickSettingsScene &&
	transitionState.toScene in SceneFamilies.NotifShade)		transitionState.toScene in SceneFamilies.NotifShade) \|\|
			(transitionState.fromScene == Scenes.Lockscreen &&
			transitionState.toScene in SceneFamilies.NotifShade) \|\|
			(transitionState.fromScene in SceneFamilies.NotifShade &&
			transitionState.toScene == Scenes.Lockscreen)
	) {		) {
	1f		1f
	} else if (		} else if (