Merge "Show "+N" label when Cue Bar has >2 MR." into main (ead43373) · Commits · e / os / android_frameworks_base

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,25 @@ fun ShortPill(
		maxLines = 1,
		modifier = Modifier.padding(horizontal = 8.dp),
		)
		} else if (
		filteredActions.size == 1 &&
		action.actionType == ActionType.MR &&
		action.icon.repeatCount > 0
		) {
		Text(
		text = action.label,
		color = outlineColor,
		style = actionTextStyle,
		overflow = TextOverflow.Ellipsis,
		maxLines = 1,
		modifier = Modifier.padding(start = 8.dp).weight(1f),
		)
		Text(
		text = "+${action.icon.repeatCount}",
		style = MaterialTheme.typography.labelMedium,
		color = MaterialTheme.colorScheme.onSurfaceVariant,
		modifier = Modifier.padding(start = 6.dp, end = 3.dp),
		)
		}
		}
		}