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

Commit c2f3cd53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Updated colors" into rvc-dev am: d8759bb3 

Change-Id: If853528a83d9c1e0d485c3f48b27a35a08ccac0b
parents f40903c7 d8759bb3

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_200" />

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

 </selector>

packages/SystemUI/res/color/thermo_cool_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_200" />

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

 </selector>

packages/SystemUI/res/color/thermo_heat_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_red_200" />

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

</selector>

packages/SystemUI/res/values/colors.xml

+7 −4
Original line number Diff line number Diff line
@@ -246,10 +246,13 @@ 
    <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_more_vert">@*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>

    <color name="control_enabled_light_background">#413C2D</color>

    <color name="control_enabled_thermo_heat_background">#41312E</color>

    <color name="control_enabled_thermo_cool_background">#303744</color>

    <color name="control_enabled_default_background">#3C3D40</color>

    <color name="control_enabled_heat_foreground">#FF8B66</color>

    <color name="control_enabled_default_foreground">@color/GM2_blue_300</color>

    <color name="control_enabled_cool_foreground">@color/GM2_blue_300</color>



    <!-- Docked misalignment message -->

    <color name="misalignment_text_color">#F28B82</color>

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class ControlViewHolder( 
    companion object {

        const val STATE_ANIMATION_DURATION = 700L

        private const val UPDATE_DELAY_IN_MILLIS = 3000L

        private const val ALPHA_ENABLED = (255.0 * 0.2).toInt()

        private const val ALPHA_ENABLED = 255

        private const val ALPHA_DISABLED = 0

        private val FORCE_PANEL_DEVICES = setOf(

            DeviceTypes.TYPE_THERMOSTAT,