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

Commit 7f59b1a2 authored by Helen Qin's avatar Helen Qin Committed by Android (Google) Code Review
Browse files

Merge "Enable the mdoc UI." into udc-dev

parents 6970f612 8135e705

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

+5 −1
Original line number Diff line number Diff line
@@ -210,7 +210,11 @@ class GetFlowUtils { 
                appName = originName

                    ?: getAppLabel(context.packageManager, requestInfo.appPackageName)

                    ?: return null,

                preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials

                preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,

                preferIdentityDocUi = getCredentialRequest.data.getBoolean(

                    // TODO(b/276777444): replace with direct library constant reference once

                    // exposed.

                    "androidx.credentials.BUNDLE_KEY_PREFER_IDENTITY_DOC_UI"),

            )

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ internal fun hasContentToDisplay(state: GetCredentialUiState): Boolean { 
}



internal fun isFallbackScreen(state: GetCredentialUiState): Boolean {

    return false

    return state.requestDisplayInfo.preferIdentityDocUi

}



internal fun findAutoSelectEntry(providerDisplayInfo: ProviderDisplayInfo): CredentialEntryInfo? {
@@ -172,6 +172,7 @@ class ActionEntryInfo( 
data class RequestDisplayInfo(

    val appName: String,

    val preferImmediatelyAvailableCredentials: Boolean,

    val preferIdentityDocUi: Boolean,

)



/**