Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea962c03 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "[CredManUi] Do not truncate password values." into udc-dev am: 365efa11 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21809120



Change-Id: If919f3cac446db3248d8fb5fcc37692e5a1f5df1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c974492 365efa11

packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,

)

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

+8 −3
Original line number Diff line number Diff line
@@ -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

packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt

+0 −7
Original line number Diff line number Diff line
@@ -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(