diff options
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt | 3 | ||||
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt index b3b75f68e71e..34e2e83d7643 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/AnimatableClockView.kt @@ -151,8 +151,6 @@ class AnimatableClockView @JvmOverloads constructor( // relayout if the text didn't actually change. if (!TextUtils.equals(text, formattedText)) { text = formattedText - lastTextUpdate = getTimestamp() - // Because the TextLayout may mutate under the hood as a result of the new text, we // notify the TextAnimator that it may have changed and request a measure/layout. A // crash will occur on the next invocation of setTextStyle if the layout is mutated @@ -161,6 +159,7 @@ class AnimatableClockView @JvmOverloads constructor( textAnimator?.updateLayout(layout) } requestLayout() + lastTextUpdate = getTimestamp() } } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt index b5e57667fbb8..19ac2e479bcb 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt @@ -90,6 +90,9 @@ class DefaultClock( override lateinit var animations: ClockAnimations private set + private var smallRegionDarkness = false + private var largeRegionDarkness = false + init { val parent = FrameLayout(ctx) @@ -148,8 +151,14 @@ class DefaultClock( smallClockIsDark: Boolean, largeClockIsDark: Boolean ) { - updateClockColor(smallClock, smallClockIsDark) - updateClockColor(largeClock, largeClockIsDark) + if (smallRegionDarkness != smallClockIsDark) { + smallRegionDarkness = smallClockIsDark + updateClockColor(smallClock, smallClockIsDark) + } + if (largeRegionDarkness != largeClockIsDark) { + largeRegionDarkness = largeClockIsDark + updateClockColor(largeClock, largeClockIsDark) + } } override fun onLocaleChanged(locale: Locale) { |