Merge "Use FontVariationCache on TextInterpolator font runs" into udc-dev
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt
index a041926..79189bc 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt
@@ -217,12 +217,14 @@
run.fontRuns.forEach { fontRun ->
fontRun.baseFont =
fontInterpolator.lerp(fontRun.baseFont, fontRun.targetFont, progress)
- val tmpFontVariationsArray = mutableListOf<FontVariationAxis>()
- fontRun.baseFont.axes.forEach {
- tmpFontVariationsArray.add(FontVariationAxis(it.tag, it.styleValue))
- }
- basePaint.fontVariationSettings =
+ val fvar = run {
+ val tmpFontVariationsArray = mutableListOf<FontVariationAxis>()
+ fontRun.baseFont.axes.forEach {
+ tmpFontVariationsArray.add(FontVariationAxis(it.tag, it.styleValue))
+ }
FontVariationAxis.toFontVariationSettings(tmpFontVariationsArray)
+ }
+ basePaint.typeface = typefaceCache.getTypefaceForVariant(fvar, basePaint)
}
}
}