diff options
3 files changed, 38 insertions, 19 deletions
diff --git a/packages/CredentialManager/res/values/strings.xml b/packages/CredentialManager/res/values/strings.xml index 1ee2a26d3acf..0882af72bb27 100644 --- a/packages/CredentialManager/res/values/strings.xml +++ b/packages/CredentialManager/res/values/strings.xml @@ -34,6 +34,7 @@ <string name="passkey">passkey</string> <string name="password">password</string> <string name="sign_ins">sign-ins</string> + <string name="passkey_before_subtitle">Passkey</string> <string name="another_device">Another device</string> <string name="other_password_manager">Other password managers</string> <!-- TODO: Check the wording here. --> diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt index f8c89bbf4c46..c9cb3ce49db5 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -576,24 +576,42 @@ fun PrimaryCreateOptionRow( label = { Column() { // TODO: Add the function to hide/view password when the type is create password - if (requestDisplayInfo.type == TYPE_PUBLIC_KEY_CREDENTIAL || - requestDisplayInfo.type == TYPE_PASSWORD_CREDENTIAL) { - Text( - text = requestDisplayInfo.title, - style = MaterialTheme.typography.titleLarge, - modifier = Modifier.padding(top = 16.dp) - ) - Text( - text = requestDisplayInfo.subtitle, - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.padding(bottom = 16.dp) - ) - } else { - Text( - text = requestDisplayInfo.title, - style = MaterialTheme.typography.titleLarge, - modifier = Modifier.padding(top = 16.dp, bottom = 16.dp) - ) + when (requestDisplayInfo.type) { + TYPE_PUBLIC_KEY_CREDENTIAL -> { + Text( + text = requestDisplayInfo.title, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(top = 16.dp) + ) + Text( + text = if (requestDisplayInfo.subtitle != null) { + stringResource( + R.string.passkey_before_subtitle) + " - " + requestDisplayInfo.subtitle + } else {stringResource(R.string.passkey_before_subtitle)}, + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 16.dp) + ) + } + TYPE_PASSWORD_CREDENTIAL -> { + Text( + text = requestDisplayInfo.title, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(top = 16.dp) + ) + Text( + // This subtitle would never be null for create password + text = requestDisplayInfo.subtitle ?: "", + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 16.dp) + ) + } + else -> { + Text( + text = requestDisplayInfo.title, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(top = 16.dp, bottom = 16.dp) + ) + } } } } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt index 52ce06a2289b..31d0365a821f 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt @@ -73,7 +73,7 @@ class RemoteInfo( data class RequestDisplayInfo( val title: String, - val subtitle: String, + val subtitle: String?, val type: String, val appDomainName: String, val typeIcon: Drawable, |