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

Commit e8551698 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:... 

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

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



Change-Id: I2af47e6144c24412fd6a687404f16cc4b95d6697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b53a3763 a5c0712e

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

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




            setUpUdfps(rootView)

            setUpUdfps(rootView)





            if (!shouldHideClock) {

                setUpClock(rootView)

                setUpClock(rootView)

            }





            rootView.measure(

            rootView.measure(

                View.MeasureSpec.makeMeasureSpec(

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

        clockController.clock = clock





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

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

        if (!shouldHideClock) {



        clock.largeClock.events.onTargetRegionChanged(

        clock.largeClock.events.onTargetRegionChanged(

            KeyguardClockSwitch.getLargeClockRegion(parentView)

            KeyguardClockSwitch.getLargeClockRegion(parentView)

        )

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

                parentView.addView(this)

                visibility = View.VISIBLE

                visibility = View.VISIBLE

            }

            }

        } else {

            clockView?.visibility = View.GONE

        }





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

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

        val hasCustomWeatherDataDisplay =

        hideSmartspace(clock.largeClock.config.hasCustomWeatherDataDisplay)

            clock.largeClock.config.hasCustomWeatherDataDisplay == true

        hideSmartspace(hasCustomWeatherDataDisplay)

    }

    }





    companion object {

    companion object {