Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Controls UI - Updated colors" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-27 02:14:25 +00:00
committed by Android (Google) Code Review
parent 142eceea7a d8ca2c0934
commit d8759bb38d
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/color/control_foreground.xml
View File

@@ -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>

2
packages/SystemUI/res/color/thermo_cool_foreground.xml
View File

@@ -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>

2
packages/SystemUI/res/color/thermo_heat_foreground.xml
View File

@@ -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>

11
packages/SystemUI/res/values/colors.xml
View File

@@ -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>

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

@@ -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,