Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c6bcd2 authored by Helen Qin's avatar Helen Qin Committed by Android (Google) Code Review
Browse files

Merge "Require a min height for the action chip text fields" into main

parents e0d0c348 5c8f8c9b

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

+7 −3
Original line number Original line Diff line number Diff line
@@ -259,10 +259,14 @@ fun ActionEntry( 
        onClick = onClick,

        onClick = onClick,

        shape = Shapes.large,

        shape = Shapes.large,

        label = {

        label = {

            Column(modifier = Modifier.wrapContentSize()

            Column(

                .padding(start = 16.dp, top = 16.dp, bottom = 16.dp)) {

                    modifier = Modifier.heightIn(min = 56.dp).wrapContentSize().padding(

                            start = 16.dp, top = 16.dp, bottom = 16.dp

                    ),

                    verticalArrangement = Arrangement.Center,

            ) {

                SmallTitleText(entryHeadlineText)

                SmallTitleText(entryHeadlineText)

                if (entrySecondLineText != null && entrySecondLineText.isNotEmpty()) {

                if (!entrySecondLineText.isNullOrBlank()) {

                    BodySmallText(entrySecondLineText)

                    BodySmallText(entrySecondLineText)

                }

                }

            }

            }