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

Commit ade2f383 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle empty action entry subtitle" into udc-dev am: 5756c965 am:... 

Merge "Handle empty action entry subtitle" into udc-dev am: 5756c965 am: 070ab755 am: 378bdfe7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23104451



Change-Id: I1287c9e71f17d661b94a2055086f5482bcb104b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f519dcde 378bdfe7

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

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ fun ActionEntry( 
            Column(modifier = Modifier.wrapContentSize()

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

                SmallTitleText(entryHeadlineText)

                if (entrySecondLineText != null) {

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

                    BodySmallText(entrySecondLineText)

                }

            }