Merge "[CredManUi] Do not truncate password values." into udc-dev am: 365efa1166 am: 3c353b2377
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21809120 Change-Id: I1acb0724e9491562dd338866c288a14b9bf510ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -44,7 +44,7 @@ data class UiState(
|
||||
val selectedEntry: BaseEntry? = null,
|
||||
val providerActivityState: ProviderActivityState = ProviderActivityState.NOT_APPLICABLE,
|
||||
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.
|
||||
val isAutoSelectFlow: Boolean = false,
|
||||
)
|
||||
|
||||
@@ -102,8 +102,9 @@ fun Entry(
|
||||
SmallTitleText(text = entryHeadlineText, enforceOneLine = enforceOneLine)
|
||||
if (passwordValue != null) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.Start,
|
||||
) {
|
||||
val visualTransformation = remember { PasswordVisualTransformation() }
|
||||
val originalPassword by remember {
|
||||
@@ -117,9 +118,13 @@ fun Entry(
|
||||
)
|
||||
}
|
||||
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(
|
||||
modifier = Modifier.padding(start = 12.dp, top = 5.dp).size(24.dp),
|
||||
modifier = Modifier.padding(start = 12.dp).size(24.dp),
|
||||
onToggle = {
|
||||
if (it) {
|
||||
displayedPassword.value = originalPassword
|
||||
|
||||
@@ -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)
|
||||
item {
|
||||
ActionChips(
|
||||
|
||||
Reference in New Issue
Block a user