Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[CredManUi] Do not truncate password values." into udc-dev

Browse Source
This commit is contained in:
Helen Qin
2023-03-07 08:00:36 +00:00
committed by Android (Google) Code Review
parent d4746b01f7 48f4a730f6
commit 365efa1166
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt
View File

@@ -44,7 +44,7 @@ data class UiState(
val selectedEntry: BaseEntry? = null, val selectedEntry: BaseEntry? = null,
val providerActivityState: ProviderActivityState = ProviderActivityState.NOT_APPLICABLE, val providerActivityState: ProviderActivityState = ProviderActivityState.NOT_APPLICABLE,
val dialogState: DialogState = DialogState.ACTIVE, val dialogState: DialogState = DialogState.ACTIVE,
// True if the UI has one and onely one auto selectable entry. Its provider activiey will be // True if the UI has one and only one auto selectable entry. Its provider activity will be
// launched immediately, and canceling it will cancel the whole UI flow. // launched immediately, and canceling it will cancel the whole UI flow.
val isAutoSelectFlow: Boolean = false, val isAutoSelectFlow: Boolean = false,
) )

11
packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt
View File

@@ -102,8 +102,9 @@ fun Entry(
SmallTitleText(text = entryHeadlineText, enforceOneLine = enforceOneLine) SmallTitleText(text = entryHeadlineText, enforceOneLine = enforceOneLine)
if (passwordValue != null) { if (passwordValue != null) {
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start,
) { ) {
val visualTransformation = remember { PasswordVisualTransformation() } val visualTransformation = remember { PasswordVisualTransformation() }
val originalPassword by remember { val originalPassword by remember {
@@ -117,9 +118,13 @@ fun Entry(
) )
} }
BodySmallText( BodySmallText(
text = displayedPassword.value, enforceOneLine = enforceOneLine) text = displayedPassword.value,
// Apply weight to allow visibility button to render first so that
// it doesn't get squeezed out by a super long password.
modifier = Modifier.wrapContentSize().weight(1f, fill = false),
)
ToggleVisibilityButton( ToggleVisibilityButton(
modifier = Modifier.padding(start = 12.dp, top = 5.dp).size(24.dp), modifier = Modifier.padding(start = 12.dp).size(24.dp),
onToggle = { onToggle = {
if (it) { if (it) {
displayedPassword.value = originalPassword displayedPassword.value = originalPassword

7
packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
View File

@@ -295,13 +295,6 @@ fun AllSignInOptionCard(
) )
} }
} }
item {
Divider(
thickness = 1.dp,
color = Color.LightGray,
modifier = Modifier.padding(top = 16.dp)
)
}
// Manage sign-ins (action chips) // Manage sign-ins (action chips)
item { item {
ActionChips( ActionChips(