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

Commit 03ef3285 authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Update tile and brightness slider colors 

Test: manually
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Fixes: 408238521
Change-Id: I6280618e0de5e82eeaec59e6c81c8ce931cc94ae
parent fbb2e5b6

packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ object BrightnessSliderMotionTestKeys { 
private fun colors(): SliderColors {

    return SliderDefaults.colors()

        .copy(

            inactiveTrackColor = LocalAndroidColorScheme.current.surfaceEffect2,

            inactiveTrackColor = LocalAndroidColorScheme.current.surfaceEffect1,

            activeTickColor = MaterialTheme.colorScheme.onPrimary,

            inactiveTickColor = MaterialTheme.colorScheme.onSurface,

        )

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ private object EditModeTileDefaults { 
    @Composable

    fun editTileColors(): TileColors =

        TileColors(

            background = LocalAndroidColorScheme.current.surfaceEffect2,

            background = LocalAndroidColorScheme.current.surfaceEffect1,

            iconBackground = Color.Transparent,

            label = MaterialTheme.colorScheme.onSurface,

            secondaryLabel = MaterialTheme.colorScheme.onSurface,

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt

+6 −6
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ private object TileDefaults { 
    @ReadOnlyComposable

    fun activeDualTargetTileColors(): TileColors =

        TileColors(

            background = LocalAndroidColorScheme.current.surfaceEffect2,

            background = LocalAndroidColorScheme.current.surfaceEffect1,

            iconBackground = MaterialTheme.colorScheme.primary,

            label = MaterialTheme.colorScheme.onSurface,

            secondaryLabel = MaterialTheme.colorScheme.onSurface,
@@ -411,8 +411,8 @@ private object TileDefaults { 
    @ReadOnlyComposable

    fun inactiveDualTargetTileColors(): TileColors =

        TileColors(

            background = LocalAndroidColorScheme.current.surfaceEffect2,

            iconBackground = LocalAndroidColorScheme.current.surfaceEffect3,

            background = LocalAndroidColorScheme.current.surfaceEffect1,

            iconBackground = LocalAndroidColorScheme.current.surfaceEffect2,

            label = MaterialTheme.colorScheme.onSurface,

            secondaryLabel = MaterialTheme.colorScheme.onSurface,

            icon = MaterialTheme.colorScheme.onSurface,
@@ -422,7 +422,7 @@ private object TileDefaults { 
    @ReadOnlyComposable

    fun inactiveTileColors(): TileColors =

        TileColors(

            background = LocalAndroidColorScheme.current.surfaceEffect2,

            background = LocalAndroidColorScheme.current.surfaceEffect1,

            iconBackground = Color.Transparent,

            label = MaterialTheme.colorScheme.onSurface,

            secondaryLabel = MaterialTheme.colorScheme.onSurface,
@@ -433,8 +433,8 @@ private object TileDefaults { 
    @ReadOnlyComposable

    fun unavailableTileColors(): TileColors {

        return TileColors(

            background = LocalAndroidColorScheme.current.surfaceEffect2,

            iconBackground = LocalAndroidColorScheme.current.surfaceEffect2,

            background = LocalAndroidColorScheme.current.surfaceEffect1,

            iconBackground = LocalAndroidColorScheme.current.surfaceEffect1,

            label = MaterialTheme.colorScheme.onSurface,

            secondaryLabel = MaterialTheme.colorScheme.onSurface,

            icon = MaterialTheme.colorScheme.onSurface,