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

Commit f061199e authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Update edit mode colors" into main

parents 5d1dd879 71584b38

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -791,7 +791,7 @@ private fun ToolbarButton( 
            onClick = onClick,

            onClick = onClick,

            colors =

            colors =

                ButtonDefaults.outlinedButtonColors(

                ButtonDefaults.outlinedButtonColors(

                    contentColor = colors.primary,

                    contentColor = colors.onPrimaryContainer,

                ),

                ),

            border = BorderStroke(width = 2.0.dp, color = colors.primary),

            border = BorderStroke(width = 2.0.dp, color = colors.primary),

            contentPadding = Dimensions.ButtonPadding,

            contentPadding = Dimensions.ButtonPadding,
@@ -855,7 +855,7 @@ private fun CommunalContent( 
/** Creates an empty card used to highlight a particular spot on the grid. */

/** Creates an empty card used to highlight a particular spot on the grid. */

@Composable

@Composable

fun HighlightedItem(modifier: Modifier = Modifier, alpha: Float = 1.0f) {

fun HighlightedItem(modifier: Modifier = Modifier, alpha: Float = 1.0f) {

    val brush = SolidColor(LocalAndroidColorScheme.current.primaryFixed)

    val brush = SolidColor(LocalAndroidColorScheme.current.primary)

    Box(

    Box(

        modifier =

        modifier =

            // drawBehind lets us draw outside the bounds of the widgets so that we don't need to

            // drawBehind lets us draw outside the bounds of the widgets so that we don't need to

packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ constructor( 
                Box(

                Box(

                    modifier =

                    modifier =

                        Modifier.fillMaxSize()

                        Modifier.fillMaxSize()

                            .background(LocalAndroidColorScheme.current.onSecondaryFixed),

                            .background(LocalAndroidColorScheme.current.surfaceDim),

                ) {

                ) {

                    CommunalHub(

                    CommunalHub(

                        viewModel = communalViewModel,

                        viewModel = communalViewModel,