Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix digit translation when digit width changes Update font variation settings in rebase" into udc-dev

Browse Source
This commit is contained in:
Sherry Zhou
2023-04-16 05:04:30 +00:00
committed by Android (Google) Code Review
parent 6a84c0a58d 70a00c7a17
commit d773fcca88
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt
View File

@@ -18,6 +18,7 @@ package com.android.systemui.animation
import android.graphics.Canvas
import android.graphics.Paint
import android.graphics.fonts.Font
import android.graphics.fonts.FontVariationAxis
import android.graphics.text.PositionedGlyphs
import android.text.Layout
import android.text.TextPaint
@@ -211,8 +212,15 @@ class TextInterpolator(layout: Layout) {
run.baseX[i] = MathUtils.lerp(run.baseX[i], run.targetX[i], progress)
run.baseY[i] = MathUtils.lerp(run.baseY[i], run.targetY[i], progress)
}
run.fontRuns.forEach {
it.baseFont = fontInterpolator.lerp(it.baseFont, it.targetFont, progress)
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 =
FontVariationAxis.toFontVariationSettings(tmpFontVariationsArray)
}
}
}