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

Commit f11642db authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes I179b9b3a,I705648c9 

* changes:
  Controls UI - Theme + color alignment
  Controls UI - Support thumbnail template
parents f8398cd0 f8cf084c

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3902,4 +3902,6 @@ 


  <!-- Whether to expand the lock screen user switcher by default -->

  <java-symbol type="bool" name="config_expandLockScreenUserSwitcher" />



  <java-symbol type="string" name="loading" />

</resources>

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>