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

Merge "Save hybrid flow uses dynamic type values." into udc-dev am: 19b25a7587

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

Change-Id: I1350dbf528579608f148cd7d096bcb080ef0dfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Helen Qin
2023-05-01 20:08:55 +00:00
committed by Automerger Merge Worker
parent fbe198a7ba 19b25a7587
commit 4a719edd8a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt
View File

@@ -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 {