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

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

Merge "[CredManUi] Tint default type icons passed in from the sdk." into... 

Merge "[CredManUi] Tint default type icons passed in from the sdk." into udc-dev am: 1bd20e7a am: 3960d552

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



Change-Id: Iadb3e9d2b154afb65fc60fad4a768277abef3e7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6410725 3960d552

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

+3 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ class GetFlowUtils { 
                            userName = credentialEntry.username.toString(),

                            displayName = credentialEntry.displayName?.toString(),

                            icon = credentialEntry.icon.loadDrawable(context),

                            shouldTintIcon = credentialEntry.isDefaultIcon ?: false,

                            lastUsedTimeMillis = credentialEntry.lastUsedTime,

                        ))

                    }
@@ -242,6 +243,7 @@ class GetFlowUtils { 
                            userName = credentialEntry.username.toString(),

                            displayName = credentialEntry.displayName?.toString(),

                            icon = credentialEntry.icon.loadDrawable(context),

                            shouldTintIcon = credentialEntry.isDefaultIcon,

                            lastUsedTimeMillis = credentialEntry.lastUsedTime,

                        ))

                    }
@@ -258,6 +260,7 @@ class GetFlowUtils { 
                            userName = credentialEntry.title.toString(),

                            displayName = credentialEntry.subtitle?.toString(),

                            icon = credentialEntry.icon.loadDrawable(context),

                            shouldTintIcon = credentialEntry.isDefaultIcon,

                            lastUsedTimeMillis = credentialEntry.lastUsedTime,

                        ))

                    }

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

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ fun CredentialEntryRow( 
    Entry(

        onClick = { onEntrySelected(credentialEntryInfo) },

        iconImageBitmap = credentialEntryInfo.icon?.toBitmap()?.asImageBitmap(),

        shouldApplyIconImageBitmapTint = credentialEntryInfo.shouldTintIcon,

        // Fall back to iconPainter if iconImageBitmap isn't available

        iconPainter =

        if (credentialEntryInfo.icon == null) painterResource(R.drawable.ic_other_sign_in_24)

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

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ class CredentialEntryInfo( 
    val userName: String,

    val displayName: String?,

    val icon: Drawable?,

    val shouldTintIcon: Boolean,

    val lastUsedTimeMillis: Instant?,

) : BaseEntry(

    providerId,