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

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

Merge "[CredManUi] Show provider name in get flow." into udc-dev am: b66d21c0 am: 4b159e1f 

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



Change-Id: I3f7f6e527d96bcab93d4496f007d490a30c3be3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54f83151 4b159e1f

packages/CredentialManager/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
  <!-- This is a label for a button that takes user to the next screen. [CHAR LIMIT=20] -->

  <string name="get_dialog_button_label_continue">Continue</string>

  <!-- Separator for sign-in type and username in a sign-in entry. -->

  <string name="get_dialog_sign_in_type_username_separator" translatable="false">" - "</string>

  <string name="get_dialog_sign_in_type_username_separator" translatable="false">" • "</string>

  <!-- This text is followed by a list of one or more options. [CHAR LIMIT=80] -->

  <string name="get_dialog_title_sign_in_options">Sign-in options</string>

  <!-- Column heading for displaying sign-ins for a specific username. [CHAR LIMIT=80] -->

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

+8 −1
Original line number Diff line number Diff line
@@ -149,7 +149,10 @@ class GetFlowUtils { 
                        icon = providerIcon,

                        displayName = providerLabel,

                        credentialEntryList = getCredentialOptionInfoList(

                            it.providerFlattenedComponentName, it.credentialEntries, context

                            providerId = it.providerFlattenedComponentName,

                            providerLabel = providerLabel,

                            credentialEntries = it.credentialEntries,

                            context = context

                        ),

                        authenticationEntryList = getAuthenticationEntryList(

                            it.providerFlattenedComponentName,
@@ -202,6 +205,7 @@ class GetFlowUtils { 
         */

        private fun getCredentialOptionInfoList(

            providerId: String,

            providerLabel: String,

            credentialEntries: List<Entry>,

            context: Context,

        ): List<CredentialEntryInfo> {
@@ -212,6 +216,7 @@ class GetFlowUtils { 
                    is PasswordCredentialEntry -> {

                        result.add(CredentialEntryInfo(

                            providerId = providerId,

                            providerDisplayName = providerLabel,

                            entryKey = it.key,

                            entrySubkey = it.subkey,

                            pendingIntent = credentialEntry.pendingIntent,
@@ -227,6 +232,7 @@ class GetFlowUtils { 
                    is PublicKeyCredentialEntry -> {

                        result.add(CredentialEntryInfo(

                            providerId = providerId,

                            providerDisplayName = providerLabel,

                            entryKey = it.key,

                            entrySubkey = it.subkey,

                            pendingIntent = credentialEntry.pendingIntent,
@@ -242,6 +248,7 @@ class GetFlowUtils { 
                    is CustomCredentialEntry -> {

                        result.add(CredentialEntryInfo(

                            providerId = providerId,

                            providerDisplayName = providerLabel,

                            entryKey = it.key,

                            entrySubkey = it.subkey,

                            pendingIntent = credentialEntry.pendingIntent,

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

+9 −8
Original line number Diff line number Diff line
@@ -415,14 +415,15 @@ fun CredentialEntryRow( 
            credentialEntryInfo.credentialType == CredentialType.PASSWORD) {

            "••••••••••••"

        } else {

            if (TextUtils.isEmpty(credentialEntryInfo.displayName))

                credentialEntryInfo.credentialTypeDisplayName

            else

                credentialEntryInfo.credentialTypeDisplayName +

                    stringResource(

                        R.string.get_dialog_sign_in_type_username_separator

                    ) +

                    credentialEntryInfo.displayName

            val itemsToDisplay = listOf(

                credentialEntryInfo.displayName,

                credentialEntryInfo.credentialTypeDisplayName,

                credentialEntryInfo.providerDisplayName

            ).filterNot(TextUtils::isEmpty)

            if (itemsToDisplay.isEmpty()) null

            else itemsToDisplay.joinToString(

                separator = stringResource(R.string.get_dialog_sign_in_type_username_separator)

            )

        },

    )

}

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

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ class CredentialEntryInfo( 
    val credentialType: CredentialType,

    /** Localized type value of this credential used for display purpose. */

    val credentialTypeDisplayName: String,

    val providerDisplayName: String,

    val userName: String,

    val displayName: String?,

    val icon: Drawable?,