diff options
| author | 2023-01-21 03:24:31 +0000 | |
|---|---|---|
| committer | 2023-01-21 03:24:31 +0000 | |
| commit | 033c8ac960b1e1b80fd2e67f2111bb3cedce9989 (patch) | |
| tree | e0938cbaa529d33d8383ed4064d703f7069ed7ca | |
| parent | 7e383fa5266bffa5572e11c9fe7011812a71fa5f (diff) | |
| parent | 65717388fd4eb34015faa254be6050151ba8e2ee (diff) | |
Merge "Ignore output switcher chip for color transitions" into tm-qpr-dev am: 669b8fd62f am: 65717388fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20815956
Change-Id: Id8434bbbd648fe42a0f30d9e15fe19e4ca784224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt | 9 |
1 files changed, 8 insertions, 1 deletions
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 5c65c8bd5689..4827a16d229d 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 @@ internal constructor( 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 } |