commit daa90f677427abd84fab401ad71826bab7bc56d2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 03 21:01:12 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 03 21:01:12 2023 +0000
tree b33c5a7fddf55a1030c8cbad3bf60d8fb70f42fc
parent 3130e82a624af160f9ce492ed74f40e3d22f553a
parent 3b11f9cefda90e4184693614378db79f0e43e731

Merge "Support sign-in title variant 'Use your saved password for <app>?'" into udc-dev

packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
index cb68776..ccbd46d 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
@@ -216,10 +216,12 @@
                 HeadlineText(
                     text = stringResource(
                         if (hasSingleEntry) {
-                            if (sortedUserNameToCredentialEntryList.firstOrNull()
-                                    ?.sortedCredentialEntryList?.first()?.credentialType
-                                == CredentialType.PASSKEY
-                            ) R.string.get_dialog_title_use_passkey_for
+                            val singleEntryType = sortedUserNameToCredentialEntryList.firstOrNull()
+                                ?.sortedCredentialEntryList?.first()?.credentialType
+                            if (singleEntryType == CredentialType.PASSKEY)
+                                R.string.get_dialog_title_use_passkey_for
+                            else if (singleEntryType == CredentialType.PASSWORD)
+                                R.string.get_dialog_title_use_password_for
                             else R.string.get_dialog_title_use_sign_in_for
                         } else R.string.get_dialog_title_choose_sign_in_for,
                         requestDisplayInfo.appName