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

Commit a103a946 authored by Matt Pietal's avatar Matt Pietal
Browse files

Controls UI - Fix colors 

Colors and state were not properly being applied. Set the bg color
directly, instead of using the unneccsary ColorStateList.

Bug: 151421548
Test: restart device, check colors
Change-Id: Ic32b6865bcaf499a2ae3540fd1c296c7aad461aa
parent a03b6abb

packages/SystemUI/res/color/control_background.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_enabled="false"

        android:color="@color/control_default_background" />

  <item android:color="@color/GM2_blue_200"

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/color/light_background.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_enabled="false"

        android:color="@color/control_default_background" />

  <item android:color="@color/GM2_yellow_200"

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/color/thermo_cool_background.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_enabled="false"

        android:color="@color/control_default_background" />

  <item android:color="@color/GM2_blue_200"

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/color/thermo_heat_background.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_enabled="false"

        android:color="@color/control_default_background" />

  <item android:color="@color/GM2_red_200"

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -225,4 +225,8 @@ 
    <color name="control_default_background">@color/GM2_grey_900</color>

    <color name="control_list_popup_background">@*android:color/background_floating_material_dark</color>

    <color name="control_spinner_dropdown">@*android:color/foreground_material_dark</color>

    <color name="control_enabled_light_background">@color/GM2_yellow_200</color>

    <color name="control_enabled_thermo_heat_background">@color/GM2_red_200</color>

    <color name="control_enabled_thermo_cool_background">@color/GM2_blue_200</color>

    <color name="control_enabled_default_background">@color/GM2_blue_200</color>

</resources>