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

Merge "Change textAnimator to modify weight in variable fonts" into tm-qpr-dev am: 9fe66836c4

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

Change-Id: Ia906c565f95ebac21504e87a892051df5c597d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sherry Zhou
2023-02-13 17:45:42 +00:00
committed by Automerger Merge Worker
parent 3deccd77d6 9fe66836c4
commit 468f6a4922
2 changed files with 102 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt
View File

@@ -23,6 +23,7 @@ import android.animation.ValueAnimator
import android.graphics.Canvas
import android.graphics.Typeface
import android.graphics.fonts.Font
import android.graphics.fonts.FontVariationAxis
import android.text.Layout
import android.util.SparseArray
@@ -215,13 +216,40 @@ class TextAnimator(layout: Layout, private val invalidateCallback: () -> Unit) {
textInterpolator.targetPaint.textSize = textSize
}
if (weight >= 0) {
// Paint#setFontVariationSettings creates Typeface instance from scratch. To reduce the
// memory impact, cache the typeface result.
textInterpolator.targetPaint.typeface =
typefaceCache.getOrElse(weight) {
textInterpolator.targetPaint.fontVariationSettings = "'$TAG_WGHT' $weight"
textInterpolator.targetPaint.typeface
val fontVariationArray =
FontVariationAxis.fromFontVariationSettings(
textInterpolator.targetPaint.fontVariationSettings
)
if (fontVariationArray.isNullOrEmpty()) {
textInterpolator.targetPaint.typeface =
typefaceCache.getOrElse(weight) {
textInterpolator.targetPaint.fontVariationSettings = "'$TAG_WGHT' $weight"
textInterpolator.targetPaint.typeface
}
} else {
val idx = fontVariationArray.indexOfFirst { it.tag == "$TAG_WGHT" }
if (idx == -1) {
val updatedFontVariation =
textInterpolator.targetPaint.fontVariationSettings + ",'$TAG_WGHT' $weight"
textInterpolator.targetPaint.typeface =
typefaceCache.getOrElse(weight) {
textInterpolator.targetPaint.fontVariationSettings =
updatedFontVariation
textInterpolator.targetPaint.typeface
}
} else {
fontVariationArray[idx] = FontVariationAxis(
"$TAG_WGHT", weight.toFloat())
val updatedFontVariation =
FontVariationAxis.toFontVariationSettings(fontVariationArray)
textInterpolator.targetPaint.typeface =
typefaceCache.getOrElse(weight) {
textInterpolator.targetPaint.fontVariationSettings =
updatedFontVariation
textInterpolator.targetPaint.typeface
}
}
}
}
if (color != null) {
textInterpolator.targetPaint.color = color

68
packages/SystemUI/tests/src/com/android/systemui/animation/TextAnimatorTest.kt
View File

@@ -19,6 +19,7 @@ package com.android.systemui.animation
import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator
import android.graphics.Typeface
import android.graphics.fonts.FontVariationAxis
import android.testing.AndroidTestingRunner
import android.text.Layout
import android.text.StaticLayout
@@ -178,4 +179,71 @@ class TextAnimatorTest : SysuiTestCase() {
assertThat(paint.typeface).isSameInstanceAs(prevTypeface)
}
@Test
fun testSetTextStyle_addWeight() {
testWeightChange("", 100, FontVariationAxis.fromFontVariationSettings("'wght' 100")!!)
}
@Test
fun testSetTextStyle_changeWeight() {
testWeightChange(
"'wght' 500",
100,
FontVariationAxis.fromFontVariationSettings("'wght' 100")!!
)
}
@Test
fun testSetTextStyle_addWeightWithOtherAxis() {
testWeightChange(
"'wdth' 100",
100,
FontVariationAxis.fromFontVariationSettings("'wght' 100, 'wdth' 100")!!
)
}
@Test
fun testSetTextStyle_changeWeightWithOtherAxis() {
testWeightChange(
"'wght' 500, 'wdth' 100",
100,
FontVariationAxis.fromFontVariationSettings("'wght' 100, 'wdth' 100")!!
)
}
private fun testWeightChange(
initialFontVariationSettings: String,
weight: Int,
expectedFontVariationSettings: Array<FontVariationAxis>
) {
val layout = makeLayout("Hello, World", PAINT)
val valueAnimator = mock(ValueAnimator::class.java)
val textInterpolator = mock(TextInterpolator::class.java)
val paint =
TextPaint().apply {
typeface = Typeface.createFromFile("/system/fonts/Roboto-Regular.ttf")
fontVariationSettings = initialFontVariationSettings
}
`when`(textInterpolator.targetPaint).thenReturn(paint)
val textAnimator =
TextAnimator(layout, {}).apply {
this.textInterpolator = textInterpolator
this.animator = valueAnimator
}
textAnimator.setTextStyle(weight = weight, animate = false)
val resultFontVariationList =
FontVariationAxis.fromFontVariationSettings(
textInterpolator.targetPaint.fontVariationSettings
)
expectedFontVariationSettings.forEach { expectedAxis ->
val resultAxis = resultFontVariationList?.filter { it.tag == expectedAxis.tag }?.get(0)
assertThat(resultAxis).isNotNull()
if (resultAxis != null) {
assertThat(resultAxis.styleValue).isEqualTo(expectedAxis.styleValue)
}
}
}
}