Merge "Ignore output switcher chip for color transitions" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
669b8fd62f
@@ -230,7 +230,14 @@ internal constructor(
|
|||||||
|
|
||||||
fun updateColorScheme(colorScheme: ColorScheme?): Boolean {
|
fun updateColorScheme(colorScheme: ColorScheme?): Boolean {
|
||||||
var anyChanged = false
|
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 }
|
colorScheme?.let { mediaViewHolder.gutsViewHolder.colorScheme = colorScheme }
|
||||||
return anyChanged
|
return anyChanged
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user