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

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

Merge changes from topic "overlay-sysui-bugfix" into main 

* changes:
  Add 32dp horizontal margin for action chips.
  Set the height of overlay chips to 48dp.
parents fc510bf2 4edfa3c1

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ActionList.kt

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.compose.animation.slideInVertically 
import androidx.compose.animation.slideOutVertically

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier
@@ -49,6 +50,7 @@ fun ActionList( 
        actions.forEachIndexed { index, action ->

            AnimatedVisibility(

                visible = visible,

                modifier = Modifier.padding(horizontal = 32.dp),

                enter =

                    slideInVertically(

                        spring(

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/Chip.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) { 
                .clip(RoundedCornerShape(24.dp))

                .background(backgroundColor)

                .clickable { action.onClick() }

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

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

    ) {

        val painter = rememberDrawablePainter(action.icon)

        Image(