From 9af5bca25e4e01a650b9eb24236f1457b7f317df Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Mon, 1 May 2023 16:21:08 +0000 Subject: [PATCH] Save hybrid flow uses dynamic type values. The confirmation title will contain passkey, password, or sign-in depending on the request type. Before, the flow unconditionally mentioned passkey. Bug: 280117374 Test: manual (see bug for screenshots) Change-Id: I64a1a2e3afa263b6c113832624c9b3694ddea71d --- .../createflow/CreateCredentialComponents.kt | 12 +++++++++++- 1 file changed, 11 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 dfa517b118b33..d16120fee4523 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -465,7 +465,17 @@ fun ExternalOnlySelectionCard( SheetContainerCard { item { HeadlineIcon(imageVector = Icons.Outlined.QrCodeScanner) } item { Divider(thickness = 16.dp, color = Color.Transparent) } - item { HeadlineText(text = stringResource(R.string.create_passkey_in_other_device_title)) } + item { + HeadlineText( + text = stringResource( + when (requestDisplayInfo.type) { + CredentialType.PASSKEY -> R.string.create_passkey_in_other_device_title + CredentialType.PASSWORD -> R.string.save_password_on_other_device_title + else -> R.string.save_sign_in_on_other_device_title + } + ) + ) + } item { Divider(thickness = 24.dp, color = Color.Transparent) } item { CredentialContainerCard {