Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Helen Qin
2023-04-06 16:24:55 +00:00
committed by Android (Google) Code Review
parent 6970f61202 8135e7056a
commit 7f59b1a27b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -210,7 +210,11 @@ class GetFlowUtils {
appName = originName appName = originName
?: getAppLabel(context.packageManager, requestInfo.appPackageName) ?: getAppLabel(context.packageManager, requestInfo.appPackageName)
?: return null, ?: 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"),
) )
} }

3
packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt
View File

@@ -42,7 +42,7 @@ internal fun hasContentToDisplay(state: GetCredentialUiState): Boolean {
} }
internal fun isFallbackScreen(state: GetCredentialUiState): Boolean { internal fun isFallbackScreen(state: GetCredentialUiState): Boolean {
return false return state.requestDisplayInfo.preferIdentityDocUi
} }
internal fun findAutoSelectEntry(providerDisplayInfo: ProviderDisplayInfo): CredentialEntryInfo? { internal fun findAutoSelectEntry(providerDisplayInfo: ProviderDisplayInfo): CredentialEntryInfo? {
@@ -172,6 +172,7 @@ class ActionEntryInfo(
data class RequestDisplayInfo( data class RequestDisplayInfo(
val appName: String, val appName: String,
val preferImmediatelyAvailableCredentials: Boolean, val preferImmediatelyAvailableCredentials: Boolean,
val preferIdentityDocUi: Boolean,
) )
/** /**