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

Commit f86b4407 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove obfuscation from clock packages" into udc-qpr-dev am:... 

Merge "Merge "Remove obfuscation from clock packages" into udc-qpr-dev am: 77808e6d" into udc-qpr-dev-plus-aosp
parents 196d5c07 169667c1

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

+12 −9
Original line number Diff line number Diff line
@@ -51,15 +51,18 @@ import kotlinx.coroutines.withContext 
private val KEY_TIMESTAMP = "appliedTimestamp"

private val KNOWN_PLUGINS =

    mapOf<String, List<ClockMetadata>>(

        "com.android.systemui.falcon.one" to listOf(ClockMetadata("ANALOG_CLOCK_BIGNUM")),

        "com.android.systemui.falcon.two" to listOf(ClockMetadata("DIGITAL_CLOCK_CALLIGRAPHY")),

        "com.android.systemui.falcon.three" to listOf(ClockMetadata("DIGITAL_CLOCK_FLEX")),

        "com.android.systemui.falcon.four" to listOf(ClockMetadata("DIGITAL_CLOCK_GROWTH")),

        "com.android.systemui.falcon.five" to listOf(ClockMetadata("DIGITAL_CLOCK_HANDWRITTEN")),

        "com.android.systemui.falcon.six" to listOf(ClockMetadata("DIGITAL_CLOCK_INFLATE")),

        "com.android.systemui.falcon.seven" to listOf(ClockMetadata("DIGITAL_CLOCK_METRO")),

        "com.android.systemui.falcon.eight" to listOf(ClockMetadata("DIGITAL_CLOCK_NUMBEROVERLAP")),

        "com.android.systemui.falcon.nine" to listOf(ClockMetadata("DIGITAL_CLOCK_WEATHER")),

        "com.android.systemui.clocks.bignum" to listOf(ClockMetadata("ANALOG_CLOCK_BIGNUM")),

        "com.android.systemui.clocks.calligraphy" to

            listOf(ClockMetadata("DIGITAL_CLOCK_CALLIGRAPHY")),

        "com.android.systemui.clocks.flex" to listOf(ClockMetadata("DIGITAL_CLOCK_FLEX")),

        "com.android.systemui.clocks.growth" to listOf(ClockMetadata("DIGITAL_CLOCK_GROWTH")),

        "com.android.systemui.clocks.handwritten" to

            listOf(ClockMetadata("DIGITAL_CLOCK_HANDWRITTEN")),

        "com.android.systemui.clocks.inflate" to listOf(ClockMetadata("DIGITAL_CLOCK_INFLATE")),

        "com.android.systemui.clocks.metro" to listOf(ClockMetadata("DIGITAL_CLOCK_METRO")),

        "com.android.systemui.clocks.numoverlap" to

            listOf(ClockMetadata("DIGITAL_CLOCK_NUMBEROVERLAP")),

        "com.android.systemui.clocks.weather" to listOf(ClockMetadata("DIGITAL_CLOCK_WEATHER")),

    )



private fun <TKey : Any, TVal : Any> ConcurrentHashMap<TKey, TVal>.concurrentGetOrPut(

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

+2 −2
Original line number Diff line number Diff line
@@ -340,9 +340,9 @@ class ClockRegistryTest : SysuiTestCase() { 
    @Test

    fun knownPluginAttached_clockAndListChanged_notLoaded() {

        val mockPluginLifecycle1 = mock<PluginLifecycleManager<ClockProviderPlugin>>()

        whenever(mockPluginLifecycle1.getPackage()).thenReturn("com.android.systemui.falcon.one")

        whenever(mockPluginLifecycle1.getPackage()).thenReturn("com.android.systemui.clocks.metro")

        val mockPluginLifecycle2 = mock<PluginLifecycleManager<ClockProviderPlugin>>()

        whenever(mockPluginLifecycle2.getPackage()).thenReturn("com.android.systemui.falcon.two")

        whenever(mockPluginLifecycle2.getPackage()).thenReturn("com.android.systemui.clocks.bignum")



        var changeCallCount = 0

        var listChangeCallCount = 0