Merge "Show inner glow during hero moment in 3btn mode." into main (29a9cbfa) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ShortPill.kt

+51 −36

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ import androidx.compose.runtime.remember
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.draw.BlurredEdgeTreatment
		import androidx.compose.ui.draw.blur
		import androidx.compose.ui.draw.clip
		import androidx.compose.ui.draw.drawBehind
		import androidx.compose.ui.geometry.Offset
		@@ -267,6 +269,7 @@ fun ShortPill(
		pillContentPosition = coordinates.positionInParent()
		},
		) {
		Box {
		Row(
		horizontalArrangement =
		Arrangement.spacedBy(-4.dp, Alignment.CenterHorizontally),
		@@ -306,6 +309,18 @@ fun ShortPill(
		}
		}
		}

		Box(
		Modifier.matchParentSize()
		.padding(1.dp)
		.blur(4.dp, edgeTreatment = BlurredEdgeTreatment.Unbounded)
		.animatedActionBorder(
		strokeWidth = 1.dp,
		cornerRadius = 16.dp,
		visible = visible,
		)
		)
		}
		}

		CloseButton(onCloseClick = onCloseClick, modifier = Modifier.size(closeButtonSize))