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

Commit 6ab20621 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ie7d2bd6a769a7a6201822f067e60df12bca45251
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d9a5180 0db4c8ea

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

+2 −1
Original line number Diff line number Diff line
@@ -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

                    )