summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2020-04-07 14:59:05 -0400
committer Matt Pietal <mpietal@google.com> 2020-04-07 14:59:05 -0400
commit38180a45c3be8fbca96bf273d7be2742ff189810 (patch)
tree3033e08845b01155870ff87dba3f4ec6a3376d31
parentbd745f763aae2e6f49343391349da7fc4bdeded0 (diff)
Controls UI - Fix heating color
Was not using the activeMode for the color offset Bug: 153459803 Test: manual Change-Id: I9e0e7a81826a3a4a39ee20bd09ecfe47d12035ed
-rw-r--r--packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
index d33cd94004fd..8fd840e6cf58 100644
--- 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) {