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

Commit 48f87fde authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I7a805f026778b56b7d54966d5ccfc5995801c189
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3682a9a 73d8ddb2

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

+6 −4
Original line number Diff line number Diff line
@@ -216,10 +216,12 @@ fun PrimarySelectionCard( 
                HeadlineText(

                    text = stringResource(

                        if (hasSingleEntry) {

                            if (sortedUserNameToCredentialEntryList.firstOrNull()

                            val singleEntryType = sortedUserNameToCredentialEntryList.firstOrNull()

                                ?.sortedCredentialEntryList?.first()?.credentialType

                                == CredentialType.PASSKEY

                            ) R.string.get_dialog_title_use_passkey_for

                            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