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

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

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

Merge "Save hybrid flow uses dynamic type values." into udc-dev am: 19b25a75 am: 4a719edd am: 555db83a

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



Change-Id: I409fa6e8218dc2c8d94b645608edb3e3779ed232
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2ce76dd 555db83a
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -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 {