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

Commit 0b7ebe8f authored by amehfooz's avatar amehfooz
Browse files

[DesktopStatusBar] Fix ChipHighlight colors 

Test: manual
Bug: 438503105
Flag: com.android.systemui.status_bar_for_desktop
Change-Id: Iae726e8f7c127a41a59d0f2339c4bc61504eecd7
parent b49bf786

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/DesktopStatusBar.kt

+16 −14
Original line number Diff line number Diff line
@@ -152,16 +152,17 @@ fun DesktopStatusBar( 


@Composable

private fun NotificationsChip(viewModel: HomeStatusBarViewModel, modifier: Modifier = Modifier) {

    val chipHighlightModel =

        if (viewModel.isNotificationsChipHighlighted) {

            ChipHighlightModel.Strong

        } else {

            ChipHighlightModel.Transparent

        }

    ShadeHighlightChip(

        modifier = modifier,

        onClick = { viewModel.onNotificationIconChipClicked() },

        backgroundColor =

            if (viewModel.isNotificationsChipHighlighted) {

                ChipHighlightModel.Strong.backgroundColor

            } else {

                Color.Transparent

            },

        onHoveredBackgroundColor = ChipHighlightModel.Transparent.onHoveredBackgroundColor,

        backgroundColor = chipHighlightModel.backgroundColor,

        onHoveredBackgroundColor = chipHighlightModel.onHoveredBackgroundColor,

        horizontalArrangement =

            Arrangement.spacedBy(DesktopStatusBar.Dimensions.ChipInternalSpacing, Alignment.Start),

    ) {
@@ -187,16 +188,17 @@ private fun QuickSettingsChip( 
    iconManagerFactory: TintedIconManager.Factory,

    modifier: Modifier = Modifier,

) {

    val chipHighlightModel =

        if (viewModel.isQuickSettingsChipHighlighted) {

            ChipHighlightModel.Strong

        } else {

            ChipHighlightModel.Transparent

        }

    ShadeHighlightChip(

        modifier = modifier,

        onClick = { viewModel.onQuickSettingsChipClicked() },

        backgroundColor =

            if (viewModel.isQuickSettingsChipHighlighted) {

                ChipHighlightModel.Strong.backgroundColor

            } else {

                Color.Transparent

            },

        onHoveredBackgroundColor = ChipHighlightModel.Transparent.onHoveredBackgroundColor,

        backgroundColor = chipHighlightModel.backgroundColor,

        onHoveredBackgroundColor = chipHighlightModel.onHoveredBackgroundColor,

        horizontalArrangement =

            Arrangement.spacedBy(DesktopStatusBar.Dimensions.ChipInternalSpacing, Alignment.Start),

    ) {