Merge "Controls UI - Fix heating color" into rvc-dev am: 75de521133

Change-Id: I0ec64a8311eb8e547a530cbd3a814d3797a2c653
2020-04-08 19:06:46 +00:00
parent 8c2b42dda8 75de521133
commit 3b5faf6974
1 changed files with 3 additions and 4 deletions
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
@@ -56,13 +56,12 @@ data class RenderInfo(
            enabled: Boolean,
            offset: Int = 0
        ): RenderInfo {
-            val (fg, bg) = deviceColorMap.getValue(deviceType)
-
-            val iconKey = if (offset > 0) {
+            val key = if (offset > 0) {
                deviceType * BUCKET_SIZE + offset
            } else deviceType

-            val iconState = deviceIconMap.getValue(iconKey)
+            val (fg, bg) = deviceColorMap.getValue(key)
+            val iconState = deviceIconMap.getValue(key)
            val resourceId = iconState[enabled]
            var icon: Drawable?
            if (resourceId == APP_ICON_ID) {