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

Commit ddae7230 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Partial revert of I113cf97bb63121b89857a2204625d15b254e5876 

This very likely will regress the font size of clocks on secondary
displays, but a partial revert is easier than a full revert.

This also includes some minor cleanup of ClockEventController

Bug: 303798047
Test: Manually checked clock theming
Change-Id: I2373ecef880c0671bbb418f95c5d3174e546306a
parent 8953d27c

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

+10 −14
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.lifecycle.repeatOnLifecycle 
import com.android.systemui.customization.R

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.DisplaySpecific

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags.DOZING_MIGRATION_1
@@ -80,8 +79,8 @@ constructor( 
    private val batteryController: BatteryController,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    private val configurationController: ConfigurationController,

    @DisplaySpecific private val resources: Resources,

    @DisplaySpecific private val context: Context,

    @Main private val resources: Resources,

    private val context: Context,

    @Main private val mainExecutor: DelayableExecutor,

    @Background private val bgExecutor: Executor,

    @KeyguardSmallClockLog private val smallLogBuffer: LogBuffer?,
@@ -212,13 +211,13 @@ constructor( 
        if (regionSamplingEnabled) {

            clock?.let { clock ->

                smallRegionSampler?.let {

                    smallClockIsDark = it.currentRegionDarkness().isDark

                    clock.smallClock.events.onRegionDarknessChanged(smallClockIsDark)

                    val isRegionDark = it.currentRegionDarkness().isDark

                    clock.smallClock.events.onRegionDarknessChanged(isRegionDark)

                }



                largeRegionSampler?.let {

                    largeClockIsDark = it.currentRegionDarkness().isDark

                    clock.largeClock.events.onRegionDarknessChanged(largeClockIsDark)

                    val isRegionDark = it.currentRegionDarkness().isDark

                    clock.largeClock.events.onRegionDarknessChanged(isRegionDark)

                }

            }

            return
@@ -226,12 +225,12 @@ constructor( 


        val isLightTheme = TypedValue()

        context.theme.resolveAttribute(android.R.attr.isLightTheme, isLightTheme, true)

        smallClockIsDark = isLightTheme.data == 0

        largeClockIsDark = isLightTheme.data == 0

        val isRegionDark = isLightTheme.data == 0



        clock?.run {

            smallClock.events.onRegionDarknessChanged(smallClockIsDark)

            largeClock.events.onRegionDarknessChanged(largeClockIsDark)

            Log.i(TAG, "Region isDark: $isRegionDark")

            smallClock.events.onRegionDarknessChanged(isRegionDark)

            largeClock.events.onRegionDarknessChanged(isRegionDark)

        }

    }

    protected open fun createRegionSampler(
@@ -261,9 +260,6 @@ constructor( 
        get() = isKeyguardVisible && dozeAmount < DOZE_TICKRATE_THRESHOLD

    private var cachedWeatherData: WeatherData? = null



    private var smallClockIsDark = true

    private var largeClockIsDark = true



    private val configListener =

        object : ConfigurationController.ConfigurationListener {

            override fun onThemeChanged() {