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

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

Merge "Cache and resend weather data when the clock changes" into udc-dev am: c99c3030 

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



Change-Id: I4608634320a6e928bc76e3aede180024b29272dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25dd8d46 c99c3030

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,7 @@ constructor( 
                }

                }

                updateFontSizes()

                updateFontSizes()

                updateTimeListeners()

                updateTimeListeners()

                cachedWeatherData?.let { value.events.onWeatherDataChanged(it) }

                value.smallClock.view.addOnAttachStateChangeListener(

                value.smallClock.view.addOnAttachStateChangeListener(

                    object : OnAttachStateChangeListener {

                    object : OnAttachStateChangeListener {

                        override fun onViewAttachedToWindow(p0: View?) {

                        override fun onViewAttachedToWindow(p0: View?) {
@@ -239,6 +240,7 @@ constructor( 
    var largeTimeListener: TimeListener? = null

    var largeTimeListener: TimeListener? = null

    val shouldTimeListenerRun: Boolean

    val shouldTimeListenerRun: Boolean

        get() = isKeyguardVisible && dozeAmount < DOZE_TICKRATE_THRESHOLD

        get() = isKeyguardVisible && dozeAmount < DOZE_TICKRATE_THRESHOLD

    private var cachedWeatherData: WeatherData? = null





    private var smallClockIsDark = true

    private var smallClockIsDark = true

    private var largeClockIsDark = true

    private var largeClockIsDark = true
@@ -305,6 +307,7 @@ constructor( 
            }

            }





            override fun onWeatherDataChanged(data: WeatherData) {

            override fun onWeatherDataChanged(data: WeatherData) {

                cachedWeatherData = data

                clock?.run { events.onWeatherDataChanged(data) }

                clock?.run { events.onWeatherDataChanged(data) }

            }

            }

        }

        }