Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3f04b05227074a891710ed6773f05bea2a840144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Helen Qin
2023-05-04 17:53:40 +00:00
committed by Automerger Merge Worker
parent ebbf72a434 6dd8509243
commit e18cee8cd5
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
View File

@@ -217,13 +217,27 @@ fun PrimarySelectionCard(
text = stringResource(
if (hasSingleEntry) {
val singleEntryType = sortedUserNameToCredentialEntryList.firstOrNull()
?.sortedCredentialEntryList?.first()?.credentialType
?.sortedCredentialEntryList?.firstOrNull()?.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 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_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
),
)