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

9 files changed, 65 insertions, 97 deletions

diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/GSFAxes.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/GSFAxes.kt
index e734dd26eb15..96feeedb8793 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/GSFAxes.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/GSFAxes.kt
@@ -25,7 +25,6 @@ data class AxisDefinition(
 )
 
 object GSFAxes {
-    @JvmStatic
     val WEIGHT =
         AxisDefinition(
             tag = "wght",
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt
index 4a39cff388a9..5b073e49192a 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt
@@ -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
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt
index 37acbe261f76..e9e61a718f08 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt
@@ -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) {
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
index bc4bdf4243cb..365567b17ec0 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
@@ -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
                     }
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt
index 1d963af3ad22..97004ef6f9a9 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt
@@ -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()
             }
 
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
index 0ec2d188833a..fae17a5321ff 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt
@@ -45,7 +45,6 @@ import com.android.systemui.plugins.clocks.ClockFontAxisSetting
 import com.android.systemui.plugins.clocks.ClockFontAxisSetting.Companion.replace
 import com.android.systemui.plugins.clocks.ClockFontAxisSetting.Companion.toFVar
 import com.android.systemui.plugins.clocks.ClockLogger
-import com.android.systemui.shared.Flags.ambientAod
 import com.android.systemui.shared.clocks.CanvasUtil.translate
 import com.android.systemui.shared.clocks.CanvasUtil.use
 import com.android.systemui.shared.clocks.ClockContext
@@ -331,7 +330,7 @@ open class SimpleDigitalClockTextView(
         textAnimator.setTextStyle(
             TextAnimator.Style(
                 fVar = if (isDozing) aodFontVariation else lsFontVariation,
-                color = if (isDozing && !ambientAod()) AOD_COLOR else lockscreenColor,
+                color = if (isDozing) AOD_COLOR else lockscreenColor,
                 textSize = if (isDozing) aodFontSizePx else lockScreenPaint.textSize,
             ),
             TextAnimator.Animation(
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt
index 15ec752a7cd9..fad66581682f 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt
@@ -19,8 +19,6 @@ package com.android.systemui.shared.clocks
 import android.content.res.Resources
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.platform.test.annotations.DisableFlags
-import android.platform.test.annotations.EnableFlags
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.widget.FrameLayout
@@ -31,7 +29,6 @@ import com.android.systemui.customization.R
 import com.android.systemui.plugins.clocks.ClockId
 import com.android.systemui.plugins.clocks.ClockSettings
 import com.android.systemui.plugins.clocks.ThemeConfig
-import com.android.systemui.shared.Flags
 import com.android.systemui.shared.clocks.DefaultClockController.Companion.DOZE_COLOR
 import com.android.systemui.util.mockito.any
 import com.android.systemui.util.mockito.eq
@@ -106,26 +103,6 @@ class DefaultClockProviderTest : SysuiTestCase() {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_AMBIENT_AOD)
-    fun defaultClock_initialize_flagOff() {
-        val clock = provider.createClock(DEFAULT_CLOCK_ID)
-        verify(mockSmallClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-        verify(mockLargeClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-
-        clock.initialize(true, 0f, 0f, {})
-
-        // This is the default darkTheme color
-        val expectedColor = context.resources.getColor(android.R.color.system_accent1_100)
-        verify(mockSmallClockView).setColors(DOZE_COLOR, expectedColor)
-        verify(mockLargeClockView).setColors(DOZE_COLOR, expectedColor)
-        verify(mockSmallClockView).onTimeZoneChanged(notNull())
-        verify(mockLargeClockView).onTimeZoneChanged(notNull())
-        verify(mockSmallClockView).refreshTime()
-        verify(mockLargeClockView).refreshTime()
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_AMBIENT_AOD)
     fun defaultClock_initialize() {
         val clock = provider.createClock(DEFAULT_CLOCK_ID)
         verify(mockSmallClockView).setColors(DOZE_COLOR, Color.MAGENTA)
@@ -133,7 +110,7 @@ class DefaultClockProviderTest : SysuiTestCase() {
 
         clock.initialize(true, 0f, 0f, null)
 
-        val expectedColor = Color.MAGENTA
+        val expectedColor = 0
         verify(mockSmallClockView).setColors(DOZE_COLOR, expectedColor)
         verify(mockLargeClockView).setColors(DOZE_COLOR, expectedColor)
         verify(mockSmallClockView).onTimeZoneChanged(notNull())
@@ -188,10 +165,8 @@ class DefaultClockProviderTest : SysuiTestCase() {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_AMBIENT_AOD)
-    fun defaultClock_events_onThemeChanged_noSeed_flagOff() {
-        // This is the default darkTheme color
-        val expectedColor = context.resources.getColor(android.R.color.system_accent1_100)
+    fun defaultClock_events_onThemeChanged_noSeed() {
+        val expectedColor = 0
         val clock = provider.createClock(DEFAULT_CLOCK_ID)
 
         verify(mockSmallClockView).setColors(DOZE_COLOR, Color.MAGENTA)
@@ -205,22 +180,6 @@ class DefaultClockProviderTest : SysuiTestCase() {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_AMBIENT_AOD)
-    fun defaultClock_events_onThemeChanged_noSeedn() {
-        val expectedColor = Color.TRANSPARENT
-        val clock = provider.createClock(DEFAULT_CLOCK_ID)
-
-        verify(mockSmallClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-        verify(mockLargeClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-
-        clock.smallClock.events.onThemeChanged(ThemeConfig(true, null))
-        clock.largeClock.events.onThemeChanged(ThemeConfig(true, null))
-
-        verify(mockSmallClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-        verify(mockLargeClockView).setColors(DOZE_COLOR, Color.MAGENTA)
-    }
-
-    @Test
     fun defaultClock_events_onThemeChanged_newSeed() {
         val initSeedColor = 10
         val newSeedColor = 20
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
index 20ee6c120ee8..029e54658f60 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockFaceEvents.kt
@@ -13,7 +13,6 @@
  */
 package com.android.systemui.plugins.clocks
 
-import android.content.Context
 import android.graphics.Rect
 import com.android.systemui.plugins.annotations.ProtectedInterface
 
@@ -61,12 +60,4 @@ data class ThemeConfig(
      * value denotes that we should use the seed color for the current system theme.
      */
     val seedColor: Int?,
-) {
-    fun getDefaultColor(context: Context): Int {
-        return when {
-            seedColor != null -> seedColor!!
-            isDarkTheme -> context.resources.getColor(android.R.color.system_accent1_100)
-            else -> context.resources.getColor(android.R.color.system_accent2_600)
-        }
-    }
-}
+)
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt
index f59dda049aa1..f920b187e7e5 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt
@@ -24,8 +24,6 @@ data class WeatherData(
         @VisibleForTesting const val TEMPERATURE_KEY = "temperature"
         private const val INVALID_WEATHER_ICON_STATE = -1
 
-        @JvmStatic
-        @JvmOverloads
         fun fromBundle(extras: Bundle, touchAction: WeatherTouchAction? = null): WeatherData? {
             val description = extras.getString(DESCRIPTION_KEY)
             val state =
@@ -48,7 +46,7 @@ data class WeatherData(
                         state = state,
                         useCelsius = extras.getBoolean(USE_CELSIUS_KEY),
                         temperature = temperature,
-                        touchAction = touchAction,
+                        touchAction = touchAction
                     )
                 if (DEBUG) {
                     Log.i(TAG, "Weather data parsed $result from $extras")
@@ -89,53 +87,53 @@ data class WeatherData(
     }
 
     // Values for WeatherStateIcon must stay in sync with go/g3-WeatherStateIcon
-    enum class WeatherStateIcon(val id: Int, val icon: String) {
-        UNKNOWN_ICON(0, ""),
+    enum class WeatherStateIcon(val id: Int) {
+        UNKNOWN_ICON(0),
 
         // Clear, day & night.
-        SUNNY(1, "a"),
-        CLEAR_NIGHT(2, "f"),
+        SUNNY(1),
+        CLEAR_NIGHT(2),
 
         // Mostly clear, day & night.
-        MOSTLY_SUNNY(3, "b"),
-        MOSTLY_CLEAR_NIGHT(4, "n"),
+        MOSTLY_SUNNY(3),
+        MOSTLY_CLEAR_NIGHT(4),
 
         // Partly cloudy, day & night.
-        PARTLY_CLOUDY(5, "b"),
-        PARTLY_CLOUDY_NIGHT(6, "n"),
+        PARTLY_CLOUDY(5),
+        PARTLY_CLOUDY_NIGHT(6),
 
         // Mostly cloudy, day & night.
-        MOSTLY_CLOUDY_DAY(7, "e"),
-        MOSTLY_CLOUDY_NIGHT(8, "e"),
-        CLOUDY(9, "e"),
-        HAZE_FOG_DUST_SMOKE(10, "d"),
-        DRIZZLE(11, "c"),
-        HEAVY_RAIN(12, "c"),
-        SHOWERS_RAIN(13, "c"),
+        MOSTLY_CLOUDY_DAY(7),
+        MOSTLY_CLOUDY_NIGHT(8),
+        CLOUDY(9),
+        HAZE_FOG_DUST_SMOKE(10),
+        DRIZZLE(11),
+        HEAVY_RAIN(12),
+        SHOWERS_RAIN(13),
 
         // Scattered showers, day & night.
-        SCATTERED_SHOWERS_DAY(14, "c"),
-        SCATTERED_SHOWERS_NIGHT(15, "c"),
+        SCATTERED_SHOWERS_DAY(14),
+        SCATTERED_SHOWERS_NIGHT(15),
 
         // Isolated scattered thunderstorms, day & night.
-        ISOLATED_SCATTERED_TSTORMS_DAY(16, "i"),
-        ISOLATED_SCATTERED_TSTORMS_NIGHT(17, "i"),
-        STRONG_TSTORMS(18, "i"),
-        BLIZZARD(19, "j"),
-        BLOWING_SNOW(20, "j"),
-        FLURRIES(21, "h"),
-        HEAVY_SNOW(22, "j"),
+        ISOLATED_SCATTERED_TSTORMS_DAY(16),
+        ISOLATED_SCATTERED_TSTORMS_NIGHT(17),
+        STRONG_TSTORMS(18),
+        BLIZZARD(19),
+        BLOWING_SNOW(20),
+        FLURRIES(21),
+        HEAVY_SNOW(22),
 
         // Scattered snow showers, day & night.
-        SCATTERED_SNOW_SHOWERS_DAY(23, "h"),
-        SCATTERED_SNOW_SHOWERS_NIGHT(24, "h"),
-        SNOW_SHOWERS_SNOW(25, "g"),
-        MIXED_RAIN_HAIL_RAIN_SLEET(26, "h"),
-        SLEET_HAIL(27, "h"),
-        TORNADO(28, "l"),
-        TROPICAL_STORM_HURRICANE(29, "m"),
-        WINDY_BREEZY(30, "k"),
-        WINTRY_MIX_RAIN_SNOW(31, "h");
+        SCATTERED_SNOW_SHOWERS_DAY(23),
+        SCATTERED_SNOW_SHOWERS_NIGHT(24),
+        SNOW_SHOWERS_SNOW(25),
+        MIXED_RAIN_HAIL_RAIN_SLEET(26),
+        SLEET_HAIL(27),
+        TORNADO(28),
+        TROPICAL_STORM_HURRICANE(29),
+        WINDY_BREEZY(30),
+        WINTRY_MIX_RAIN_SNOW(31);
 
         companion object {
             fun fromInt(value: Int) = values().firstOrNull { it.id == value }