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

Merge "Controls UI - Fix heating color" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-08 18:54:56 +00:00
committed by Android (Google) Code Review
parent 7284bf15da 38180a45c3
commit 75de521133
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
View File

@@ -56,13 +56,12 @@ data class RenderInfo(
enabled: Boolean, enabled: Boolean,
offset: Int = 0 offset: Int = 0
): RenderInfo { ): RenderInfo {
val (fg, bg) = deviceColorMap.getValue(deviceType) val key = if (offset > 0) {
val iconKey = if (offset > 0) {
deviceType * BUCKET_SIZE + offset deviceType * BUCKET_SIZE + offset
} else deviceType } else deviceType
val iconState = deviceIconMap.getValue(iconKey) val (fg, bg) = deviceColorMap.getValue(key)
val iconState = deviceIconMap.getValue(key)
val resourceId = iconState[enabled] val resourceId = iconState[enabled]
var icon: Drawable? var icon: Drawable?
if (resourceId == APP_ICON_ID) { if (resourceId == APP_ICON_ID) {