From b0b1aa8c81df4f899aa09d541643bd7226b1caf6 Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Fri, 3 Mar 2023 07:14:17 +0000 Subject: [PATCH] [CredManUi] Update the credential type icon svgs. The new svgs contains better paddings compared to the previous ones. Also for the remote entry icon, directly use the m3 qr code icon. Bug: 271511695 Test: manual (see bug for screenshots) Change-Id: I6daf29962cd0e0fa192b76bfe39672ad9f1f0a0e --- .../res/drawable/ic_other_devices.xml | 15 -------- .../res/drawable/ic_other_sign_in.xml | 36 ------------------- .../res/drawable/ic_other_sign_in_24.xml | 30 ++++++++++++++++ .../res/drawable/ic_passkey.xml | 16 --------- .../res/drawable/ic_passkey_24.xml | 28 +++++++++++++++ .../res/drawable/ic_password.xml | 31 ---------------- .../res/drawable/ic_password_24.xml | 34 ++++++++++++++++++ .../CredentialManagerRepo.kt | 2 +- .../credentialmanager/DataConverter.kt | 12 +++---- .../createflow/CreateCredentialComponents.kt | 5 +-- .../getflow/GetCredentialComponents.kt | 6 ++-- 11 files changed, 106 insertions(+), 109 deletions(-) delete mode 100644 packages/CredentialManager/res/drawable/ic_other_devices.xml delete mode 100644 packages/CredentialManager/res/drawable/ic_other_sign_in.xml create mode 100644 packages/CredentialManager/res/drawable/ic_other_sign_in_24.xml delete mode 100644 packages/CredentialManager/res/drawable/ic_passkey.xml create mode 100644 packages/CredentialManager/res/drawable/ic_passkey_24.xml delete mode 100644 packages/CredentialManager/res/drawable/ic_password.xml create mode 100644 packages/CredentialManager/res/drawable/ic_password_24.xml diff --git a/packages/CredentialManager/res/drawable/ic_other_devices.xml b/packages/CredentialManager/res/drawable/ic_other_devices.xml deleted file mode 100644 index 754648cbca1df..0000000000000 --- a/packages/CredentialManager/res/drawable/ic_other_devices.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/CredentialManager/res/drawable/ic_other_sign_in.xml b/packages/CredentialManager/res/drawable/ic_other_sign_in.xml deleted file mode 100644 index 81501972d3bac..0000000000000 --- a/packages/CredentialManager/res/drawable/ic_other_sign_in.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packages/CredentialManager/res/drawable/ic_other_sign_in_24.xml b/packages/CredentialManager/res/drawable/ic_other_sign_in_24.xml new file mode 100644 index 0000000000000..ce2aeb213cf27 --- /dev/null +++ b/packages/CredentialManager/res/drawable/ic_other_sign_in_24.xml @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file diff --git a/packages/CredentialManager/res/drawable/ic_passkey.xml b/packages/CredentialManager/res/drawable/ic_passkey.xml deleted file mode 100644 index 041a321640734..0000000000000 --- a/packages/CredentialManager/res/drawable/ic_passkey.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/packages/CredentialManager/res/drawable/ic_passkey_24.xml b/packages/CredentialManager/res/drawable/ic_passkey_24.xml new file mode 100644 index 0000000000000..a2c4f374caf18 --- /dev/null +++ b/packages/CredentialManager/res/drawable/ic_passkey_24.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/packages/CredentialManager/res/drawable/ic_password.xml b/packages/CredentialManager/res/drawable/ic_password.xml deleted file mode 100644 index bf3056a115c17..0000000000000 --- a/packages/CredentialManager/res/drawable/ic_password.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/CredentialManager/res/drawable/ic_password_24.xml b/packages/CredentialManager/res/drawable/ic_password_24.xml new file mode 100644 index 0000000000000..8b24e882faf42 --- /dev/null +++ b/packages/CredentialManager/res/drawable/ic_password_24.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt index 0e604ce2cf3af..d2ed1564f5c15 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt @@ -73,7 +73,7 @@ class CredentialManagerRepo( requestInfo = intent.extras?.getParcelable( RequestInfo.EXTRA_REQUEST_INFO, RequestInfo::class.java - ) ?: testCreatePasskeyRequestInfo() + ) ?: testGetRequestInfo() val originName: String? = when (requestInfo.type) { RequestInfo.TYPE_CREATE -> requestInfo.createCredentialRequest?.origin diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index 1f6c8ec5897ba..43912c26f3c83 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -220,7 +220,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.username.toString(), displayName = credentialEntry.displayName?.toString(), - icon = credentialEntry.icon?.loadDrawable(context), + icon = credentialEntry.icon.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) } @@ -235,7 +235,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.username.toString(), displayName = credentialEntry.displayName?.toString(), - icon = credentialEntry.icon?.loadDrawable(context), + icon = credentialEntry.icon.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) } @@ -250,7 +250,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.title.toString(), displayName = credentialEntry.subtitle?.toString(), - icon = credentialEntry.icon?.loadDrawable(context), + icon = credentialEntry.icon.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) } @@ -432,7 +432,7 @@ class CreateFlowUtils { createCredentialRequestJetpack.password, CredentialType.PASSWORD, appLabel, - context.getDrawable(R.drawable.ic_password) ?: return null, + context.getDrawable(R.drawable.ic_password_24) ?: return null, preferImmediatelyAvailableCredentials = false, ) is CreatePublicKeyCredentialRequest -> { @@ -455,7 +455,7 @@ class CreateFlowUtils { type = CredentialType.UNKNOWN, appName = appLabel, typeIcon = displayInfo.credentialTypeIcon?.loadDrawable(context) - ?: context.getDrawable(R.drawable.ic_other_sign_in) ?: return null, + ?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null, preferImmediatelyAvailableCredentials = false, ) } @@ -643,7 +643,7 @@ class CreateFlowUtils { displayName, CredentialType.PASSKEY, appLabel, - context.getDrawable(R.drawable.ic_passkey) ?: return null, + context.getDrawable(R.drawable.ic_passkey_24) ?: return null, preferImmediatelyAvailableCredentials, ) } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt index c0a4ce8940e66..0dfac17a51ca4 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt @@ -20,6 +20,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.outlined.QrCodeScanner import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf @@ -512,7 +513,7 @@ fun ExternalOnlySelectionCard( onConfirm: () -> Unit, ) { SheetContainerCard { - item { HeadlineIcon(painter = painterResource(R.drawable.ic_other_devices)) } + 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 { Divider(thickness = 24.dp, color = Color.Transparent) } @@ -691,7 +692,7 @@ fun RemoteEntryRow( ) { Entry( onClick = { onRemoteEntrySelected(remoteInfo) }, - iconPainter = painterResource(R.drawable.ic_other_devices), + iconImageVector = Icons.Outlined.QrCodeScanner, entryHeadlineText = stringResource(R.string.another_device), ) } \ No newline at end of file diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt index c5028c25c5da6..384f6c9884409 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt @@ -28,6 +28,8 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.QrCodeScanner import androidx.compose.material3.Divider import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -338,7 +340,7 @@ fun RemoteEntryCard( ) { Entry( onClick = { onEntrySelected(remoteEntry) }, - iconPainter = painterResource(R.drawable.ic_other_devices), + iconImageVector = Icons.Outlined.QrCodeScanner, entryHeadlineText = stringResource( R.string.get_dialog_option_headline_use_a_different_device ), @@ -399,7 +401,7 @@ fun CredentialEntryRow( iconImageBitmap = credentialEntryInfo.icon?.toBitmap()?.asImageBitmap(), // Fall back to iconPainter if iconImageBitmap isn't available iconPainter = - if (credentialEntryInfo.icon == null) painterResource(R.drawable.ic_other_sign_in) + if (credentialEntryInfo.icon == null) painterResource(R.drawable.ic_other_sign_in_24) else null, entryHeadlineText = credentialEntryInfo.userName, entrySecondLineText = if (