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

Commit 071b234d authored by Helen Qin's avatar Helen Qin
Browse files

Update UX spec 

1. Scrim min height update
2. Update bottom padding of the bottom sheet content (18dp->8dp)

Bug: 327517497
Test: screenshots in bug
Change-Id: I7ad448fb7481c60d6d4ae33ba78acdc682b12cee
parent 4972f329

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

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

import com.android.credentialmanager.ui.theme.EntryShape

import kotlinx.coroutines.launch

import kotlinx.coroutines.launch







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

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

@Composable

@Composable

@OptIn(ExperimentalMaterial3Api::class)

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

                dragHandle = null,

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

                // 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.

                // 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 {

    } else {

        val scope = rememberCoroutineScope()

        val scope = rememberCoroutineScope()

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

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




package com.android.credentialmanager.common.ui

package com.android.credentialmanager.common.ui





import android.credentials.flags.Flags

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.ColumnScope

import androidx.compose.foundation.layout.ColumnScope

import androidx.compose.foundation.layout.WindowInsets

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

            modifier = Modifier.padding(

                start = 24.dp,

                start = 24.dp,

                end = 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

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

            ).fillMaxWidth().wrapContentHeight(),

            ).fillMaxWidth().wrapContentHeight(),

            horizontalAlignment = Alignment.CenterHorizontally,

            horizontalAlignment = Alignment.CenterHorizontally,