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

Commit 1f86685e authored by Harsh Lal's avatar Harsh Lal
Browse files

Enhance fallback UI for single entry 

Bug: 275377503
Test: local-deployment
Change-Id: If07f7a6a233f29b623028c322f6124fc88f69886
parent 76acc81f

packages/CredentialManager/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ 
  <string name="get_dialog_title_choose_sign_in_for">Choose a saved sign-in for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>

  <!-- This appears as the title of the dialog asking for user to make a choice from various previously saved credentials to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_choose_option_for">Choose an option for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <!-- This appears as the title of the dialog asking user to use a previously saved credentials to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_info_on">Use this info on <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <!-- This is a label for a button that links the user to different sign-in methods . [CHAR LIMIT=80] -->

  <string name="get_dialog_use_saved_passkey_for">Sign in another way</string>

  <!-- This is a label for a button that links the user to different sign-in methods. [CHAR LIMIT=80] -->

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

+24 −2
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ import com.android.credentialmanager.CredentialSelectorViewModel 
import com.android.credentialmanager.R

import com.android.credentialmanager.common.BaseEntry

import com.android.credentialmanager.common.ProviderActivityState

import com.android.credentialmanager.common.ui.ConfirmButton

import com.android.credentialmanager.common.ui.CredentialContainerCard

import com.android.credentialmanager.common.ui.CtaButtonRow

import com.android.credentialmanager.common.ui.HeadlineIcon

import com.android.credentialmanager.common.ui.HeadlineText

import com.android.credentialmanager.common.ui.LargeLabelTextOnSurfaceVariant
@@ -62,6 +64,7 @@ fun GetGenericCredentialScreen( 
                            providerDisplayInfo = getCredentialUiState.providerDisplayInfo,

                            providerInfoList = getCredentialUiState.providerInfoList,

                            onEntrySelected = viewModel::getFlowOnEntrySelected,

                            onConfirm = viewModel::getFlowOnConfirmEntrySelected,

                            onLog = { viewModel.logUiEvent(it) },

                    )

                    viewModel.uiMetrics.log(GetCredentialEvent
@@ -93,10 +96,13 @@ fun PrimarySelectionCardGeneric( 
        providerDisplayInfo: ProviderDisplayInfo,

        providerInfoList: List<ProviderInfo>,

        onEntrySelected: (BaseEntry) -> Unit,

        onConfirm: () -> Unit,

        onLog: @Composable (UiEventLogger.UiEventEnum) -> Unit,

) {

    val sortedUserNameToCredentialEntryList =

            providerDisplayInfo.sortedUserNameToCredentialEntryList

    val totalEntriesCount = sortedUserNameToCredentialEntryList

            .flatMap { it.sortedCredentialEntryList }.size

    SheetContainerCard {

        // When only one provider (not counting the remote-only provider) exists, display that

        // provider's icon + name up top.
@@ -125,7 +131,11 @@ fun PrimarySelectionCardGeneric( 
        item {

            HeadlineText(

                    text = stringResource(

                            R.string.get_dialog_title_choose_option_for,

                            if (totalEntriesCount == 1) {

                                R.string.get_dialog_title_use_info_on

                            } else {

                                R.string.get_dialog_title_choose_option_for

                            },

                            requestDisplayInfo.appName

                    ),

            )
@@ -134,7 +144,6 @@ fun PrimarySelectionCardGeneric( 
        item {

            CredentialContainerCard {

                Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {

                    // Show max 4 entries in this primary page

                    sortedUserNameToCredentialEntryList.forEach {

                        // TODO(b/275375861): fallback UI merges entries by account names.

                        //  Need a strategy to be able to show all entries.
@@ -147,6 +156,19 @@ fun PrimarySelectionCardGeneric( 
                }

            }

        }

        item { Divider(thickness = 24.dp, color = Color.Transparent) }

        item {

            if (totalEntriesCount == 1) {

                CtaButtonRow(

                    rightButton = {

                        ConfirmButton(

                            stringResource(R.string.get_dialog_button_label_continue),

                            onClick = onConfirm

                        )

                    }

                )

            }

        }

    }

    onLog(GetCredentialEvent.CREDMAN_GET_CRED_PRIMARY_SELECTION_CARD)

}