Merge "Clocks now correctly respond to font setting changes" into tm-qpr-dev (fa0dc28b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 {

+14 −0

Original line number	Diff line number	Diff line
		@@ -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