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

Commit de267273 authored Mar 04, 2025 by Priyanka Advani (xWF) Committed by Android (Google) Code Review Mar 04, 2025

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

parents a6b62db9 2c657000

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

+0 −1

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

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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ 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

+9 −1

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

		override fun onThemeChanged(theme: ThemeConfig) {
		view.updateColor(theme.getDefaultColor(clockCtx.context))
		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)
		}

		override fun onFontSettingChanged(fontSizePx: Float) {

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

+8 −1

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

		val color = theme.getDefaultColor(ctx)
		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)
		}

		if (currentColor == color) {
		return
		}

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

+9 −1

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

		override fun onThemeChanged(theme: ThemeConfig) {
		view.updateColor(theme.getDefaultColor(clockCtx.context))
		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)
		refreshTime()
		}