Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[CredManUi] Don't display separator when display name is empty" into udc-dev am: 0db4c8ea84

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

Change-Id: I509b7aad12f131ad02310aee34a5f96b075ee5cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Helen Qin
2023-03-23 15:05:14 +00:00
committed by Automerger Merge Worker
parent 5e23c419d1 0db4c8ea84
commit 3dd75301e4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
View File

@@ -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
)