Merge "Fix latency issue" (f53204eb) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt

+12 −2

Original line number	Diff line number	Diff line
		@@ -84,6 +84,9 @@ class DefaultClock(
		resources.getFloat(R.dimen.keyguard_clock_line_spacing_scale_burmese)
		private val defaultLineSpacing = resources.getFloat(R.dimen.keyguard_clock_line_spacing_scale)

		private var smallRegionDarkness = RegionDarkness.DEFAULT
		private var largeRegionDarkness = RegionDarkness.DEFAULT

		private fun updateClockColor(clock: AnimatableClockView, isRegionDark: RegionDarkness) {
		val color = if (isRegionDark.isDark) {
		resources.getColor(android.R.color.system_accent2_100)
		@@ -91,6 +94,7 @@ class DefaultClock(
		resources.getColor(android.R.color.system_accent1_600)
		}
		clock.setColors(DOZE_COLOR, color)
		clock.animateAppearOnLockscreen()
		}

		override val events = object : ClockEvents {
		@@ -119,9 +123,15 @@ class DefaultClock(
		smallClockIsDark: RegionDarkness,
		largeClockIsDark: RegionDarkness
		) {
		if (smallRegionDarkness != smallClockIsDark) {
		smallRegionDarkness = smallClockIsDark
		updateClockColor(smallClock, smallClockIsDark)
		}
		if (largeRegionDarkness != largeClockIsDark) {
		largeRegionDarkness = largeClockIsDark
		updateClockColor(largeClock, largeClockIsDark)
		}
		}

		override fun onLocaleChanged(locale: Locale) {
		val nf = NumberFormat.getInstance(locale)

+0 −4

Original line number	Diff line number	Diff line
		@@ -48,10 +48,6 @@ class RegionSamplingInstance(
		}
		}

		fun createRegionSamplingInstance(): Pair<RegionDarkness, Rect> {
		return Pair(isDark, samplingBounds)
		}

		fun currentClockDarkness(): RegionDarkness {
		return isDark
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,9 @@ class ClockEventController @Inject constructor(
		}

		fun updateRegionSamplers(currentClock: Clock?) {
		smallRegionSamplingInstance.stopRegionSampler()
		largeRegionSamplingInstance.stopRegionSampler()

		smallRegionSamplingInstance = RegionSamplingInstance(
		currentClock?.smallClock,
		mainExecutor,