Merge "Deflake Lockscreen Clock Screenshot Tests" into tm-qpr-dev (0b6c884d) · Commits · e / os / android_frameworks_base

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -189,8 +189,13 @@ class AnimatableClockView @JvmOverloads constructor(

		override fun onDraw(canvas: Canvas) {
		lastDraw = getTimestamp()
		// intentionally doesn't call super.onDraw here or else the text will be rendered twice
		// Use textAnimator to render text if animation is enabled.
		// Otherwise default to using standard draw functions.
		if (isAnimationEnabled) {
		textAnimator?.draw(canvas)
		} else {
		super.onDraw(canvas)
		}
		}

		override fun invalidate() {
		@@ -345,6 +350,9 @@ class AnimatableClockView @JvmOverloads constructor(
		onAnimationEnd = onAnimationEnd
		)
		textAnimator?.glyphFilter = glyphFilter
		if (color != null && !isAnimationEnabled) {
		setTextColor(color)
		}
		} else {
		// when the text animator is set, update its start values
		onTextAnimatorInitialized = Runnable {
		@@ -359,6 +367,9 @@ class AnimatableClockView @JvmOverloads constructor(
		onAnimationEnd = onAnimationEnd
		)
		textAnimator?.glyphFilter = glyphFilter
		if (color != null && !isAnimationEnabled) {
		setTextColor(color)
		}
		}
		}
		}