From a578564800653cdafe404094e59d994fe46c3227 Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Tue, 21 Mar 2023 23:27:18 +0000 Subject: [CredManUi] Don't display separator when display name is empty Bug: 273808782 Test: manual (see bug for screenshot) Change-Id: I9ecb5612bcc334e9e3d1b9068a4f2664af3d0d07 --- .../android/credentialmanager/createflow/CreateCredentialComponents.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt index bcf692fceacc..7b98049b51c0 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -16,6 +16,7 @@ package com.android.credentialmanager.createflow +import android.text.TextUtils import androidx.activity.compose.ManagedActivityResultLauncher import androidx.activity.result.ActivityResult import androidx.activity.result.IntentSenderRequest @@ -668,7 +669,7 @@ fun PrimaryCreateOptionRow( entryHeadlineText = requestDisplayInfo.title, entrySecondLineText = when (requestDisplayInfo.type) { CredentialType.PASSKEY -> { - if (requestDisplayInfo.subtitle != null) { + if (!TextUtils.isEmpty(requestDisplayInfo.subtitle)) { requestDisplayInfo.subtitle + " • " + stringResource( R.string.passkey_before_subtitle ) -- cgit v1.2.3-59-g8ed1b