Merge "Use modifier on expandable only" into main (903ae024) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt

+7 −6

Original line number	Diff line number	Diff line
		@@ -1169,16 +1169,17 @@ private fun DeviceChip(
		color = Color.Transparent,
		shape = RoundedCornerShape(12.dp),
		),
		modifier = modifier.padding(top = 16.dp, bottom = 8.dp),
		useModifierBasedImplementation = true,
		) {
		Box(
		modifier =
		modifier
		.heightIn(min = 48.dp)
		.clickable(interactionSource = clickInteractionSource, indication = null) {
		Modifier.heightIn(min = 48.dp).clickable(
		interactionSource = clickInteractionSource,
		indication = null,
		) {
		viewModel.onClick(it)
		}
		.padding(top = 16.dp, bottom = 8.dp)
		) {
		Row(
		verticalAlignment = Alignment.CenterVertically,