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

Commit 1cb0b93f authored Mar 04, 2025 by Treehugger Robot Committed by Android (Google) Code Review Mar 04, 2025

Merge "Revert^2 "Consolidate clock color logic"" into main

parents 5e294222 9db5d253

packages/SystemUI/animation/src/com/android/systemui/animation/GSFAxes.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ data class AxisDefinition(
		)

		object GSFAxes {
		@JvmStatic
		val WEIGHT =
		AxisDefinition(
		tag = "wght",

packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ interface TypefaceVariantCache {
		fun getTypefaceForVariant(fvar: String?): Typeface?

		companion object {
		@JvmStatic
		fun createVariantTypeface(baseTypeface: Typeface, fVar: String?): Typeface {
		if (fVar.isNullOrEmpty()) {
		return baseTypeface

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt

+1 −9

Original line number	Diff line number	Diff line
		@@ -161,15 +161,7 @@ class ComposedDigitalLayerController(private val clockCtx: ClockContext) :
		}

		override fun onThemeChanged(theme: ThemeConfig) {
		val color =
		when {
		theme.seedColor != null -> theme.seedColor!!
		theme.isDarkTheme ->
		clockCtx.resources.getColor(android.R.color.system_accent1_100)
		else -> clockCtx.resources.getColor(android.R.color.system_accent2_600)
		}

		view.updateColor(color)
		view.updateColor(theme.getDefaultColor(clockCtx.context))
		}

		override fun onFontSettingChanged(fontSizePx: Float) {

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt

+1 −8

Original line number	Diff line number	Diff line
		@@ -149,14 +149,7 @@ class DefaultClockController(
		override fun onThemeChanged(theme: ThemeConfig) {
		this@DefaultClockFaceController.theme = theme

		val color =
		when {
		theme.seedColor != null -> theme.seedColor!!
		theme.isDarkTheme ->
		resources.getColor(android.R.color.system_accent1_100)
		else -> resources.getColor(android.R.color.system_accent2_600)
		}

		val color = theme.getDefaultColor(ctx)
		if (currentColor == color) {
		return
		}

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt

+1 −9

Original line number	Diff line number	Diff line
		@@ -229,15 +229,7 @@ open class SimpleDigitalHandLayerController(
		}

		override fun onThemeChanged(theme: ThemeConfig) {
		val color =
		when {
		theme.seedColor != null -> theme.seedColor!!
		theme.isDarkTheme ->
		clockCtx.resources.getColor(android.R.color.system_accent1_100)
		else -> clockCtx.resources.getColor(android.R.color.system_accent2_600)
		}

		view.updateColor(color)
		view.updateColor(theme.getDefaultColor(clockCtx.context))
		refreshTime()
		}