Merge "Require a min height for the action chip text fields" into main (e3c6bcd2) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt

+7 −3

Original line number	Diff line number	Diff line
		@@ -259,10 +259,14 @@ fun ActionEntry(
		onClick = onClick,
		shape = Shapes.large,
		label = {
		Column(modifier = Modifier.wrapContentSize()
		.padding(start = 16.dp, top = 16.dp, bottom = 16.dp)) {
		Column(
		modifier = Modifier.heightIn(min = 56.dp).wrapContentSize().padding(
		start = 16.dp, top = 16.dp, bottom = 16.dp
		),
		verticalArrangement = Arrangement.Center,
		) {
		SmallTitleText(entryHeadlineText)
		if (entrySecondLineText != null && entrySecondLineText.isNotEmpty()) {
		if (!entrySecondLineText.isNullOrBlank()) {
		BodySmallText(entrySecondLineText)
		}
		}