Merge "[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev" into tm-qpr-dev (60e003dd) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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()
		}
		}

+11 −2

Original line number	Diff line number	Diff line
		@@ -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,9 +151,15 @@ class DefaultClock(
		smallClockIsDark: Boolean,
		largeClockIsDark: Boolean
		) {
		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)