From 9e18e6ad66ba51e3a05cadb71b4d8e95e792ab96 Mon Sep 17 00:00:00 2001
From: Hawkwood Glazier <jglazier@google.com>
Date: Fri, 16 Sep 2022 20:22:23 +0000
Subject: [PATCH] Clocks now correctly respond to font setting changes

Bug: 247155813
Test: Manually validated the small clock changes correctly
Change-Id: Ib7be0b5a3130b30ac98d4d7be668839fc924cd81
---
 .../com/android/keyguard/ClockEventController.kt   |  4 ++++
 .../android/keyguard/ClockEventControllerTest.kt   | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
index 0e1e0cb2adcf0..b444f4c1110bd 100644
--- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
+++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
@@ -137,6 +137,10 @@ open class ClockEventController @Inject constructor(
         override fun onThemeChanged() {
             updateFun.updateColors()
         }
+
+        override fun onDensityOrFontScaleChanged() {
+            clock?.events?.onFontSettingChanged()
+        }
     }
 
     private val batteryCallback = object : BatteryStateChangeCallback {
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
index 914d94522e83f..25e7dbb5f26dc 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
@@ -118,6 +118,20 @@ class ClockEventControllerTest : SysuiTestCase() {
         verify(events, times(2)).onColorPaletteChanged(any(), any(), any())
     }
 
+    @Test
+    fun fontChanged_verifyFontSizeUpdated() {
+        clockEventController.clock = clock
+        verify(events).onColorPaletteChanged(any(), any(), any())
+
+        clockEventController.registerListeners()
+
+        val captor = argumentCaptor<ConfigurationController.ConfigurationListener>()
+        verify(configurationController).addCallback(capture(captor))
+        captor.value.onDensityOrFontScaleChanged()
+
+        verify(events).onFontSettingChanged()
+    }
+
     @Test
     fun batteryCallback_keyguardShowingCharging_verifyChargeAnimation() {
         clockEventController.clock = clock