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

Commit f25c221d authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "NavBarPill should never be shorter than NavBar" into main

parents d0876bb1 6dd51764

packages/SystemUI/compose/features/src/com/android/systemui/underlay/ui/compose/NavBarPill.kt

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Arrangement 
import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.defaultMinSize

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.shape.CircleShape
@@ -109,11 +110,12 @@ fun NavBarPill( 
            Spacer(modifier = Modifier.size(closeButtonSize))



            Row(

                horizontalArrangement = Arrangement.spacedBy(4.dp),

                horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally),

                verticalAlignment = Alignment.CenterVertically,

                modifier =

                    Modifier.clip(RoundedCornerShape(16.dp))

                        .border(2.dp, outlineColor, RoundedCornerShape(16.dp))

                        .defaultMinSize(minWidth = navBarWidth)

                        .background(backgroundColor)

                        .clickable { onClick() }

                        .padding(horizontal = 8.dp, vertical = 6.dp)