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

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

Controls UI - Theme + color alignment 

Ignore theme colors and use dark colors by default at all times for
controls. Apply latest color changes to match design.

Bug: 149485215
Test: visual
Change-Id: I179b9b3a4469f7373f7a2d5174d435fdda1b6ac0
parent 5bdfba47

packages/SystemUI/res/color/control_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
<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_50" />

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

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/color/control_foreground.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

   <item android:state_enabled="false"

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

   <item android:color="@color/GM2_blue_700" />

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

 </selector>

packages/SystemUI/res/color/light_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
<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_50" />

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

        android:alpha="0.2" />

</selector>

packages/SystemUI/res/color/light_foreground.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_enabled="false"

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

  <item android:color="@color/GM2_orange_900" />

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

</selector>

packages/SystemUI/res/color/thermo_cool_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
<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_50" />

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

        android:alpha="0.2" />

</selector>