diff options
| author | 2023-04-06 16:47:34 +0000 | |
|---|---|---|
| committer | 2023-04-06 16:47:34 +0000 | |
| commit | b8d5cc339c2f1f70488e0cf4776f44b757bfbf4a (patch) | |
| tree | da54ddc0bc6bf53c65d125b7bcd8918d43bb7c58 | |
| parent | c487be4038e7f9cb930a021fe4136d0c750630a7 (diff) | |
| parent | 7f59b1a27b0eb46c31685b7a0a66da7dd4c8e5f8 (diff) | |
Merge "Enable the mdoc UI." into udc-dev am: 7f59b1a27b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22479742
Change-Id: If8e968a940fe1e26c2de4112f99cb0292a15924a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt | 6 | ||||
| -rw-r--r-- | packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index 725401fb85bb..7bf1d1993906 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -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"), ) } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt index 7a8679038579..c9c62a48d130 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt @@ -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, ) /** |