Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85c3dc28 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Use FontVariationCache on TextInterpolator font runs 

Bug: 278470896
Test: Checked device code for hiccups
Change-Id: I5aa9c0341d4e1a94a220ec943ada28104681bf03
parent 74240559

packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt

+7 −5
Original line number Diff line number Diff line
@@ -217,13 +217,15 @@ class TextInterpolator( 
                run.fontRuns.forEach { fontRun ->

                    fontRun.baseFont =

                        fontInterpolator.lerp(fontRun.baseFont, fontRun.targetFont, progress)

                    val fvar = run {

                        val tmpFontVariationsArray = mutableListOf<FontVariationAxis>()

                        fontRun.baseFont.axes.forEach {

                            tmpFontVariationsArray.add(FontVariationAxis(it.tag, it.styleValue))

                        }

                    basePaint.fontVariationSettings =

                        FontVariationAxis.toFontVariationSettings(tmpFontVariationsArray)

                    }

                    basePaint.typeface = typefaceCache.getTypefaceForVariant(fvar, basePaint)

                }

            }

        }