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

Commit 21d3c21e authored by Joy Babafemi's avatar Joy Babafemi
Browse files

Modify logic for inline suggestions builder to align with Credman UX spec 

1. Change inline suggestion title to display name instead of username. If not set, use username
2. If there are duplicate display names, display the username as the subtitle.

Bug: 310038358
Change-Id: I6ff06f2a440e3c2c9043a4d77d464ec7913ff8ba
parent ce31eaf8

packages/CredentialManager/src/com/android/credentialmanager/autofill/CredentialAutofillService.kt

+13 −1
Original line number Diff line number Diff line
@@ -201,6 +201,14 @@ class CredentialAutofillService : AutofillService() { 
        var i = 0

        var datasetAdded = false



        val duplicateDisplayNames: MutableMap<String, Boolean> = mutableMapOf()

        providerDisplayInfo.sortedUserNameToCredentialEntryList.forEach {

            val credentialEntry = it.sortedCredentialEntryList.first()

            credentialEntry.displayName?.let {displayName ->

                val duplicateEntry = duplicateDisplayNames.contains(displayName)

                duplicateDisplayNames[displayName] = duplicateEntry

            }

        }

        providerDisplayInfo.sortedUserNameToCredentialEntryList.forEach usernameLoop@{

            val primaryEntry = it.sortedCredentialEntryList.first()

            val pendingIntent = primaryEntry.pendingIntent
@@ -235,10 +243,14 @@ class CredentialAutofillService : AutofillService() { 
                } else {

                    spec = inlinePresentationSpecs[inlinePresentationSpecsCount - 1]

                }

                val displayName : String = primaryEntry.displayName ?: primaryEntry.userName

                val sliceBuilder = InlineSuggestionUi

                        .newContentBuilder(pendingIntent)

                        .setTitle(primaryEntry.userName)

                        .setTitle(displayName)

                sliceBuilder.setStartIcon(icon)

                if (duplicateDisplayNames[displayName] == true) {

                    sliceBuilder.setSubtitle(primaryEntry.userName)

                }

                inlinePresentation = InlinePresentation(

                        sliceBuilder.build().slice, spec, /* pinned= */ false)

            }