Merge "Split the cred entry line of "[displayName] • [credential type] •... (6b151ccc) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -152,14 +152,14 @@ fun Entry(
		},
		)
		}
		} else if (entrySecondLineText != null) {
		} else if (!entrySecondLineText.isNullOrBlank()) {
		BodySmallText(
		text = entrySecondLineText,
		enforceOneLine = enforceOneLine,
		onTextLayout = onTextLayout,
		)
		}
		if (entryThirdLineText != null) {
		if (!entryThirdLineText.isNullOrBlank()) {
		BodySmallText(
		text = entryThirdLineText,
		enforceOneLine = enforceOneLine,

+4 −4

Original line number	Diff line number	Diff line
		@@ -786,16 +786,16 @@ fun CredentialEntryRow(
		else if (credentialEntryInfo.icon == null) painterResource(R.drawable.ic_other_sign_in_24)
		else null,
		entryHeadlineText = username,
		entrySecondLineText =
		entrySecondLineText = displayName,
		entryThirdLineText =
		(if (hasSingleEntry != null && hasSingleEntry)
		if (credentialEntryInfo.credentialType == CredentialType.PASSKEY \|\|
		credentialEntryInfo.credentialType == CredentialType.PASSWORD)
		listOf(displayName)
		emptyList()
		// Still show the type display name for all non-password/passkey types since it won't be
		// mentioned in the bottom sheet heading.
		else listOf(displayName, credentialEntryInfo.credentialTypeDisplayName)
		else listOf(credentialEntryInfo.credentialTypeDisplayName)
		else listOf(
		displayName,
		credentialEntryInfo.credentialTypeDisplayName,
		credentialEntryInfo.providerDisplayName
		)).filterNot(TextUtils::isEmpty).let { itemsToDisplay ->