Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
George Lin
2023-05-15 14:40:15 +00:00
committed by Android (Google) Code Review
parent 9b1007948e e1e7338bf5
commit b8ef48898b
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {