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

Commit 0d907818 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Update the sign-in title variants." into udc-dev am: 6dd85092 

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



Change-Id: If6deb00ac8ec981fe5705200f01c123f8d51fef0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents def0072b 6dd85092

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -217,13 +217,27 @@ fun PrimarySelectionCard( 
                    text = stringResource(

                    text = stringResource(

                        if (hasSingleEntry) {

                        if (hasSingleEntry) {

                            val singleEntryType = sortedUserNameToCredentialEntryList.firstOrNull()

                            val singleEntryType = sortedUserNameToCredentialEntryList.firstOrNull()

                                ?.sortedCredentialEntryList?.first()?.credentialType

                                ?.sortedCredentialEntryList?.firstOrNull()?.credentialType

                            if (singleEntryType == CredentialType.PASSKEY)

                            if (singleEntryType == CredentialType.PASSKEY)

                                R.string.get_dialog_title_use_passkey_for

                                R.string.get_dialog_title_use_passkey_for

                            else if (singleEntryType == CredentialType.PASSWORD)

                            else if (singleEntryType == CredentialType.PASSWORD)

                                R.string.get_dialog_title_use_password_for

                                R.string.get_dialog_title_use_password_for

                            else if (authenticationEntryList.isNotEmpty())

                                R.string.get_dialog_title_unlock_options_for

                            else R.string.get_dialog_title_use_sign_in_for

                            else R.string.get_dialog_title_use_sign_in_for

                        } else R.string.get_dialog_title_choose_sign_in_for,

                        } else {

                            if (authenticationEntryList.isNotEmpty() ||

                                sortedUserNameToCredentialEntryList.any { perNameEntryList ->

                                    perNameEntryList.sortedCredentialEntryList.any { entry ->

                                        entry.credentialType != CredentialType.PASSWORD &&

                                            entry.credentialType != CredentialType.PASSKEY

                                    }

                                }

                            )

                                R.string.get_dialog_title_choose_sign_in_for

                            else

                                R.string.get_dialog_title_choose_saved_sign_in_for

                        },

                        requestDisplayInfo.appName

                        requestDisplayInfo.appName

                    ),

                    ),

                )

                )