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

Commit f0a7aa68 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Clocks now correctly respond to font setting changes" into tm-qpr-dev am: fa0dc28b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19974909



Change-Id: I6968d7aa2d22b38bc63387de464e46c2e9eded92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0db85f1 fa0dc28b

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,10 @@ open class ClockEventController @Inject constructor( 
        override fun onThemeChanged() {

        override fun onThemeChanged() {

            updateFun.updateColors()

            updateFun.updateColors()

        }

        }



        override fun onDensityOrFontScaleChanged() {

            clock?.events?.onFontSettingChanged()

        }

    }

    }





    private val batteryCallback = object : BatteryStateChangeCallback {

    private val batteryCallback = object : BatteryStateChangeCallback {

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+14 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,20 @@ class ClockEventControllerTest : SysuiTestCase() { 
        verify(events, times(2)).onColorPaletteChanged(any(), any(), any())

        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

    @Test

    fun batteryCallback_keyguardShowingCharging_verifyChargeAnimation() {

    fun batteryCallback_keyguardShowingCharging_verifyChargeAnimation() {

        clockEventController.clock = clock

        clockEventController.clock = clock