diff options
2 files changed, 12 insertions, 4 deletions
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt index de679895eedb..081490e50907 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt @@ -232,6 +232,14 @@ class CredentialSelectorViewModel( ) } + fun getFlowOnBackToHybridSnackBarScreen() { + uiState = uiState.copy( + getCredentialUiState = uiState.getCredentialUiState?.copy( + currentScreenState = GetScreenState.REMOTE_ONLY + ) + ) + } + fun getFlowOnBackToPrimarySelectionScreen() { uiState = uiState.copy( getCredentialUiState = uiState.getCredentialUiState?.copy( diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt index 74933c9e3da6..cb68776935de 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt @@ -121,9 +121,10 @@ fun GetCredentialScreen( providerDisplayInfo = getCredentialUiState.providerDisplayInfo, onEntrySelected = viewModel::getFlowOnEntrySelected, onBackButtonClicked = - viewModel::getFlowOnBackToPrimarySelectionScreen, + if (getCredentialUiState.isNoAccount) + viewModel::getFlowOnBackToHybridSnackBarScreen + else viewModel::getFlowOnBackToPrimarySelectionScreen, onCancel = viewModel::onUserCancel, - isNoAccount = getCredentialUiState.isNoAccount, onLog = { viewModel.logUiEvent(it) }, ) viewModel.uiMetrics.log(GetCredentialEvent @@ -327,7 +328,6 @@ fun AllSignInOptionCard( onEntrySelected: (BaseEntry) -> Unit, onBackButtonClicked: () -> Unit, onCancel: () -> Unit, - isNoAccount: Boolean, onLog: @Composable (UiEventEnum) -> Unit, ) { val sortedUserNameToCredentialEntryList = @@ -336,7 +336,7 @@ fun AllSignInOptionCard( SheetContainerCard(topAppBar = { MoreOptionTopAppBar( text = stringResource(R.string.get_dialog_title_sign_in_options), - onNavigationIconClicked = if (isNoAccount) onCancel else onBackButtonClicked, + onNavigationIconClicked = onBackButtonClicked, bottomPadding = 0.dp, ) }) { |