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

Commit 6cdce72d authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "[CredManUi] Padding between credential card & subheader 8dp" into udc-dev am: 767a9abe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21961723



Change-Id: I9322dd4ae4f6e0cdb4636fc356785397e6cdd557
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79668ec5 767a9abe

packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.compose.ui.graphics.vector.ImageVector 
import androidx.compose.ui.res.stringResource

import androidx.compose.ui.text.AnnotatedString

import androidx.compose.ui.text.input.PasswordVisualTransformation

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.dp

import com.android.credentialmanager.R

import com.android.credentialmanager.ui.theme.EntryShape
@@ -315,6 +316,7 @@ fun CtaButtonRow( 
fun MoreOptionTopAppBar(

    text: String,

    onNavigationIconClicked: () -> Unit,

    bottomPadding: Dp,

) {

    TopAppBar(

        title = {
@@ -341,6 +343,6 @@ fun MoreOptionTopAppBar( 
            }

        },

        colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent),

        modifier = Modifier.padding(top = 12.dp, bottom = 8.dp)

        modifier = Modifier.padding(top = 12.dp, bottom = bottomPadding)

    )

}
 
 No newline at end of file

packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ fun MoreAboutPasskeySectionHeader(text: String) { 


@Composable

private fun InternalSectionHeader(text: String, color: Color) {

    Row(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {

    Row(modifier = Modifier.fillMaxWidth().wrapContentHeight().padding(top = 8.dp)) {

        SectionHeaderText(

            text,

            modifier = Modifier.padding(top = 20.dp, bottom = 8.dp),

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

+2 −2
Original line number Diff line number Diff line
@@ -371,9 +371,9 @@ fun MoreOptionsSelectionCard( 
            onNavigationIconClicked =

            if (isFromProviderSelection) onBackProviderSelectionButtonSelected

            else onBackCreationSelectionButtonSelected,

            bottomPadding = 16.dp,

        )

    }) {

        item { Divider(thickness = 8.dp, color = Color.Transparent) } // Top app bar has a 8dp

        // bottom padding already

        item {

            CredentialContainerCard {
@@ -617,9 +617,9 @@ fun MoreAboutPasskeysIntroCard( 
            MoreOptionTopAppBar(

                text = stringResource(R.string.more_about_passkeys_title),

                onNavigationIconClicked = onBackPasskeyIntroButtonSelected,

                bottomPadding = 0.dp,

            )

        },

        contentVerticalArrangement = Arrangement.spacedBy(8.dp)

    ) {

        item {

            MoreAboutPasskeySectionHeader(

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

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ fun AllSignInOptionCard( 
        MoreOptionTopAppBar(

            text = stringResource(R.string.get_dialog_title_sign_in_options),

            onNavigationIconClicked = if (isNoAccount) onCancel else onBackButtonClicked,

            bottomPadding = 0.dp,

        )

    }) {

        // For username