Merge "Disable fade-out animation on grid items" into main (83c8b557) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+11 −6

Original line number	Diff line number	Diff line
		@@ -931,7 +931,9 @@ private fun BoxScope.CommunalHubLazyGrid(
		Modifier.requiredSize(dpSize)
		.thenIf(!isItemDragging) {
		Modifier.animateItem(
		placementSpec = spring(stiffness = Spring.StiffnessMediumLow)
		placementSpec = spring(stiffness = Spring.StiffnessMediumLow),
		// See b/376495198 - not supported with AndroidView
		fadeOutSpec = null,
		)
		}
		.thenIf(isItemDragging) { Modifier.zIndex(1f) },
		@@ -980,9 +982,12 @@ private fun BoxScope.CommunalHubLazyGrid(
		size = size,
		selected = false,
		modifier =
		Modifier.requiredSize(dpSize).animateItem().thenIf(
		communalResponsiveGrid()
		) {
		Modifier.requiredSize(dpSize)
		.animateItem(
		// See b/376495198 - not supported with AndroidView
		fadeOutSpec = null
		)
		.thenIf(communalResponsiveGrid()) {
		Modifier.graphicsLayer { alpha = itemAlpha?.value ?: 1f }
		},
		index = index,