Merge "Do not listen to clock change if should hide clock" into udc-dev (b8ef4889) · Commits · e / os / android_frameworks_base

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 {