diff options
6 files changed, 39 insertions, 27 deletions
diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt index d67c8c2809ba..a75aeaff0c48 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt @@ -124,7 +124,6 @@ fun WearApp( handleGetNavigation( navController = navController, state = state, - onCloseApp = onCloseApp, selectEntry = selectEntry ) } @@ -147,7 +146,6 @@ fun WearApp( private fun handleGetNavigation( navController: NavController, state: CredentialSelectorUiState.Get, - onCloseApp: () -> Unit, selectEntry: (entry: EntryInfo, isAutoSelected: Boolean) -> Unit, ) { when (state) { diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/SignInHeader.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/SignInHeader.kt index 437a699abcee..0afef5eba85e 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/SignInHeader.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/SignInHeader.kt @@ -56,6 +56,6 @@ fun SignInHeader( text = title, ) - Spacer(modifier = Modifier.size(12.dp)) + Spacer(modifier = Modifier.size(8.dp)) } } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFlattenScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFlattenScreen.kt index a545e48eec0f..fb81e736171b 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFlattenScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFlattenScreen.kt @@ -27,7 +27,7 @@ import com.android.credentialmanager.CredentialSelectorUiState.Get.MultipleEntry import com.android.credentialmanager.FlowEngine import com.android.credentialmanager.R import com.android.credentialmanager.common.ui.components.WearButtonText -import com.android.credentialmanager.common.ui.components.WearDisplayNameText +import com.android.credentialmanager.common.ui.components.WearSecondaryLabel import com.android.credentialmanager.model.get.CredentialEntryInfo import com.android.credentialmanager.ui.components.CredentialsScreenChipSpacer import com.google.android.horologist.annotations.ExperimentalHorologistApi @@ -64,10 +64,9 @@ fun MultiCredentialsFlattenScreen( credentialSelectorUiState.accounts.forEach { userNameEntries -> item { - WearDisplayNameText( + WearSecondaryLabel( text = userNameEntries.userName, - modifier = Modifier.padding(top = 16.dp, bottom = 8.dp, start = 14.dp, - end = 14.dp) + modifier = Modifier.padding(top = 12.dp, bottom = 4.dp) ) } @@ -86,9 +85,9 @@ fun MultiCredentialsFlattenScreen( } } item { - WearDisplayNameText( + WearSecondaryLabel( text = stringResource(R.string.provider_list_title), - modifier = Modifier.padding(top = 12.dp, bottom = 8.dp, start = 14.dp, end = 14.dp) + modifier = Modifier.padding(top = 12.dp, bottom = 4.dp) ) } credentialSelectorUiState.actionEntryList.forEach { actionEntry -> diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt index 23163d568117..7addc74aecd0 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt @@ -61,7 +61,10 @@ fun MultiCredentialsFoldScreen( val credentials = credentialSelectorUiState.sortedEntries item { var title = stringResource(R.string.choose_sign_in_title) - if (credentials.all{ it.credentialType == CredentialType.PASSKEY }) { + + if (credentials.isEmpty()) { + title = stringResource(R.string.choose_sign_in_title) + } else if (credentials.all{ it.credentialType == CredentialType.PASSKEY }) { title = stringResource(R.string.choose_passkey_title) } else if (credentials.all { it.credentialType == CredentialType.PASSWORD }) { title = stringResource(R.string.choose_password_title) @@ -74,16 +77,16 @@ fun MultiCredentialsFoldScreen( } credentials.forEach { credential: CredentialEntryInfo -> - item { - CredentialsScreenChip( - label = credential.userName, - onClick = { selectEntry(credential, false) }, - secondaryLabel = credential.credentialTypeDisplayName, - icon = credential.icon, - ) - CredentialsScreenChipSpacer() - } + item { + CredentialsScreenChip( + label = credential.userName, + onClick = { selectEntry(credential, false) }, + secondaryLabel = credential.credentialTypeDisplayName, + icon = credential.icon, + ) + CredentialsScreenChipSpacer() } + } credentialSelectorUiState.authenticationEntryList.forEach { authenticationEntryInfo -> item { @@ -93,10 +96,13 @@ fun MultiCredentialsFoldScreen( CredentialsScreenChipSpacer() } } + + item { + Spacer(modifier = Modifier.size(8.dp)) + } + item { - Spacer(modifier = Modifier.size(12.dp)) SignInOptionsChip { flowEngine.openSecondaryScreen() } - CredentialsScreenChipSpacer() } item { DismissChip { flowEngine.cancel() } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt index de7c1f19e193..03608a48beb6 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt @@ -61,10 +61,18 @@ fun SinglePasskeyScreen( ) }, accountContent = { - AccountRow( - primaryText = checkNotNull(entry.displayName), + val displayName = entry.displayName + if (displayName == null || + entry.displayName.equals(entry.userName, ignoreCase = true)) { + AccountRow( + primaryText = entry.userName, + ) + } else { + AccountRow( + primaryText = displayName, secondaryText = entry.userName, ) + } }, columnState = columnState, modifier = Modifier.padding(horizontal = 10.dp) diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt index 884d9f6e5e16..34d6e977533e 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt @@ -59,14 +59,15 @@ fun SignInWithProviderScreen( }, accountContent = { val displayName = entry.displayName - if (displayName != null) { + if (displayName == null || + entry.displayName.equals(entry.userName, ignoreCase = true)) { AccountRow( - primaryText = displayName, - secondaryText = entry.userName, + primaryText = entry.userName, ) } else { AccountRow( - primaryText = entry.userName, + primaryText = displayName, + secondaryText = entry.userName, ) } }, |