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

Commit e53ec881 authored by George Lin's avatar George Lin Committed by Automerger Merge Worker
Browse files

Merge "Do not listen to clock change if should hide clock" into udc-dev am: b8ef4889 

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



Change-Id: I2c50c9b7c96293bc09297098e739f0420ce7da12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 116a8531 b8ef4889

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+16 −19
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ constructor( 


            setUpUdfps(rootView)



            if (!shouldHideClock) {

                setUpClock(rootView)

            }



            rootView.measure(

                View.MeasureSpec.makeMeasureSpec(
@@ -352,7 +354,7 @@ constructor( 
        clockController.clock = clock



        colorOverride?.let { clock.events.onSeedColorChanged(it) }

        if (!shouldHideClock) {



        clock.largeClock.events.onTargetRegionChanged(

            KeyguardClockSwitch.getLargeClockRegion(parentView)

        )
@@ -366,14 +368,9 @@ constructor( 
                parentView.addView(this)

                visibility = View.VISIBLE

            }

        } else {

            clockView?.visibility = View.GONE

        }



        // Hide smart space if the clock has weather display; otherwise show it

        val hasCustomWeatherDataDisplay =

            clock.largeClock.config.hasCustomWeatherDataDisplay == true

        hideSmartspace(hasCustomWeatherDataDisplay)

        hideSmartspace(clock.largeClock.config.hasCustomWeatherDataDisplay)

    }



    companion object {