Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69893902 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Ignore output switcher chip for color transitions 

The output switcher chip intentionally changes colors when toggling dark
mode. Since that element  uses the same accent colors as other elements, we can
ignore changes for it when deciding whether to animate to a new palette

Fixes: 261695345
Test: manual - toggle dark mode, observe chip color changes without any other flickering
Change-Id: I960d4f64f86fced604b18b86ff0aba5724af4abc
parent bdb5065a

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

+8 −1
Original line number Diff line number Diff line
@@ -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

    }