commit 65717388fd4eb34015faa254be6050151ba8e2ee
author Beth Thibodeau <ethibodeau@google.com> Sat Jan 21 02:39:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 21 02:39:01 2023 +0000
tree b314f8e24871c2798798b4ae6cc75afe827b794e
parent d50083d2325b054a61a014078e8d0e4a7cacb93c
parent 669b8fd62fdd7843af86cf51a779504e68d9f6d0

Merge "Ignore output switcher chip for color transitions" into tm-qpr-dev am: 669b8fd62f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20815956

Change-Id: Ic94786e48c87af855e4d5840cb14d17a8e830275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt

diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt
index 5c65c8b..4827a16 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt
@@ -230,7 +230,14 @@
 
     fun updateColorScheme(colorScheme: ColorScheme?): Boolean {
         var anyChanged = false
-        colorTransitions.forEach { anyChanged = it.updateColorScheme(colorScheme) || anyChanged }
+        colorTransitions.forEach {
+            val isChanged = it.updateColorScheme(colorScheme)
+
+            // Ignore changes to colorSeamless, since that is expected when toggling dark mode
+            if (it == colorSeamless) return@forEach
+
+            anyChanged = isChanged || anyChanged
+        }
         colorScheme?.let { mediaViewHolder.gutsViewHolder.colorScheme = colorScheme }
         return anyChanged
     }