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

Commit 1e9e0426 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Fix digit translation when digit width changes Update font variation... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22564207



Change-Id: I7a1e4ff7e566d2225212cb8ff68f69fdf0f9d99a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 839a256d d773fcca

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

+10 −2
Original line number Diff line number Diff line
@@ -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)

                }

            }

        }