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

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

@@ -124,7 +124,9 @@ constructor(
 
             setUpUdfps(rootView)
 
-            setUpClock(rootView)
+            if (!shouldHideClock) {
+                setUpClock(rootView)
+            }
 
             rootView.measure(
                 View.MeasureSpec.makeMeasureSpec(
@@ -352,28 +354,23 @@ constructor(
         clockController.clock = clock
 
         colorOverride?.let { clock.events.onSeedColorChanged(it) }
-        if (!shouldHideClock) {
-            clock.largeClock.events.onTargetRegionChanged(
-                KeyguardClockSwitch.getLargeClockRegion(parentView)
-            )
 
-            clockView?.let { parentView.removeView(it) }
+        clock.largeClock.events.onTargetRegionChanged(
-            clockView =
+            KeyguardClockSwitch.getLargeClockRegion(parentView)
-                clock.largeClock.view.apply {
+        )
-                    if (shouldHighlightSelectedAffordance) {
+
-                        alpha = DIM_ALPHA
+        clockView?.let { parentView.removeView(it) }
-                    }
+        clockView =
-                    parentView.addView(this)
+            clock.largeClock.view.apply {
-                    visibility = View.VISIBLE
+                if (shouldHighlightSelectedAffordance) {
+                    alpha = DIM_ALPHA
                 }
-        } else {
+                parentView.addView(this)
-            clockView?.visibility = View.GONE
+                visibility = View.VISIBLE
-        }
+            }
 
         // 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 {