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

Commit 94e78278 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update UX spec" into main

parents fc875fde 071b234d

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

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.credentialmanager.common.material.rememberModalBottomSheetSta 
import com.android.credentialmanager.ui.theme.EntryShape

import kotlinx.coroutines.launch





/** Draws a modal bottom sheet with the same styles and effects shared by various flows. */

@Composable

@OptIn(ExperimentalMaterial3Api::class)
@@ -73,7 +72,7 @@ fun ModalBottomSheet( 
                dragHandle = null,

                // Never take over the full screen. We always want to leave some top scrim space

                // for exiting and viewing the underlying app to help a user gain context.

                modifier = Modifier.padding(top = 56.dp),

                modifier = Modifier.padding(top = 72.dp),

        )

    } else {

        val scope = rememberCoroutineScope()

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.credentialmanager.common.ui



import android.credentials.flags.Flags

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.ColumnScope

import androidx.compose.foundation.layout.WindowInsets
@@ -63,7 +64,7 @@ fun SheetContainerCard( 
            modifier = Modifier.padding(

                start = 24.dp,

                end = 24.dp,

                bottom = 18.dp,

                bottom = if (Flags.selectorUiImprovementsEnabled()) 8.dp else 18.dp,

                top = if (topAppBar == null) 24.dp else 0.dp

            ).fillMaxWidth().wrapContentHeight(),

            horizontalAlignment = Alignment.CenterHorizontally,