Merge "Allow chips with attribution to always expand" into main (e2efe83e) · Commits · e / os / android_frameworks_base

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

+10 −15

Original line number	Diff line number	Diff line
		@@ -133,21 +133,15 @@ fun NavBarPill(
		contentDescription = action.label,
		modifier = Modifier.size(16.dp).clip(CircleShape),
		)
		}

		if (
		actions.size == 1 \|\|
		(actions.isNotEmpty() && actions.last().attribution != null)
		) {
		val lastAction = actions.last()
		if (actions.size == 1 \|\| action.attribution != null) {
		Text(
		text = lastAction.label,
		text = action.label,
		style = MaterialTheme.typography.labelSmall,
		color = outlineColor,
		)
		if (lastAction.attribution != null) {
		if (action.attribution != null) {
		Text(
		text = lastAction.attribution,
		text = action.attribution,
		style = MaterialTheme.typography.labelSmall,
		color = outlineColor,
		modifier = Modifier.padding(start = 4.dp).alpha(0.4f),
		@@ -155,6 +149,7 @@ fun NavBarPill(
		}
		}
		}
		}

		PlatformIconButton(
		modifier =