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

Commit 555db83a 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 am: 4a719edd 

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



Change-Id: Id29c0956ca8060e2a33cd409268b2265323f6ebf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81c4e1ba 4a719edd

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

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