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

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

Merge "Select the default clock if current clock id was not found" into... 

Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414 am: bd6653ed

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



Change-Id: Ibf3b1a9b909d6ee77198f5534907f7bcc583a002
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01e850cd bd6653ed

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

+12 −0
Original line number Diff line number Diff line
@@ -401,6 +401,18 @@ open class ClockRegistry( 
            scope.launch(bgDispatcher) { mutateSetting { it.copy(seedColor = value) } }

        }



    // Returns currentClockId if clock is connected, otherwise DEFAULT_CLOCK_ID. Since this

    // is dependent on which clocks are connected, it may change when a clock is installed or

    // removed from the device (unlike currentClockId).

    // TODO: Merge w/ CurrentClockId when we convert to a flow. We shouldn't need both behaviors.

    val activeClockId: String

        get() {

            if (!availableClocks.containsKey(currentClockId)) {

                return DEFAULT_CLOCK_ID

            }

            return currentClockId

        }



    init {

        // Register default clock designs

        for (clock in defaultClockProvider.getClocks()) {

packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt

+19 −0
Original line number Diff line number Diff line
@@ -223,6 +223,25 @@ class ClockRegistryTest : SysuiTestCase() { 
        assertEquals(mockClock, clock)

    }



    @Test

    fun activeClockId_changeAfterPluginConnected() {

        val plugin1 = FakeClockPlugin()

            .addClock("clock_1", "clock 1")

            .addClock("clock_2", "clock 2")



        val plugin2 = FakeClockPlugin()

            .addClock("clock_3", "clock 3", { mockClock })

            .addClock("clock_4", "clock 4")



        registry.applySettings(ClockSettings("clock_3", null))



        pluginListener.onPluginLoaded(plugin1, mockContext, mockPluginLifecycle)

        assertEquals(DEFAULT_CLOCK_ID, registry.activeClockId)



        pluginListener.onPluginLoaded(plugin2, mockContext, mockPluginLifecycle)

        assertEquals("clock_3", registry.activeClockId)

    }



    @Test

    fun createDefaultClock_pluginDisconnected() {

        val plugin1 = FakeClockPlugin()