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

Commit d6887fee authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

[Dual Shade] Use hightlight colors for status icons 

This uses the correct foreground and background colors (same as with the
notifications side).

Test: manual, light and dark mode
Fixes: 439801846
Flag: com.android.systemui.scene_container
Change-Id: I6b5d4b42270e858ee9d936a2425bb33c0661263c
parent 21492f3d

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+2 −10
Original line number Diff line number Diff line
@@ -344,14 +344,6 @@ fun ContentScope.OverlayShadeHeader( 
    showClock: Boolean,

    modifier: Modifier = Modifier,

) {

    val localContext = LocalContext.current

    val themedContext =

        ContextThemeWrapper(localContext, R.style.Theme_SystemUI_QuickSettings_Header)

    val primaryColor =

        Utils.getColorAttrDefaultColor(themedContext, android.R.attr.textColorPrimary)

    val inverseColor =

        Utils.getColorAttrDefaultColor(themedContext, android.R.attr.textColorPrimaryInverse)



    val horizontalPadding =

        max(LocalScreenCornerRadius.current / 2f, Shade.Dimensions.HorizontalPadding)
@@ -418,8 +410,8 @@ fun ContentScope.OverlayShadeHeader( 
                        viewModel = viewModel,

                        useExpandedFormat = false,

                        modifier = Modifier.padding(end = paddingEnd).weight(1f, fill = false),

                        foregroundColor = if (isHighlighted) primaryColor else inverseColor,

                        backgroundColor = if (isHighlighted) inverseColor else primaryColor,

                        foregroundColor = quickSettingsHighlight.foregroundColor.toArgb(),

                        backgroundColor = quickSettingsHighlight.backgroundColor.toArgb(),

                    )

                    BatteryInfo(

                        viewModel = viewModel,