summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Seigo Nonaka <nona@google.com> 2024-08-03 13:34:42 +0900
committer Seigo Nonaka <nona@google.com> 2024-10-04 11:49:24 +0900
commit16a74e092f12b648a9c7abe27193f75aa87e6c3d (patch)
treeaa7ca2e8025e8490b47f195a13b69749e93be650
parent53aebb03325b85ddaeb76ff3e71593b2097e8274 (diff)
Connect stored variation settings to Minikin
Bug: 361260253 Test: minikin_tests Flag: com.android.text.flags.typeface_redesign Change-Id: I69218ca84b66e4d0a2b3bc4ec5fbc8c20ef105d6
-rw-r--r--libs/hwui/hwui/MinikinUtils.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp
index ede385adc779..9cd6e253140e 100644
--- a/libs/hwui/hwui/MinikinUtils.cpp
+++ b/libs/hwui/hwui/MinikinUtils.cpp
@@ -48,6 +48,7 @@ minikin::MinikinPaint MinikinUtils::prepareMinikinPaint(const Paint* paint,
minikinPaint.localeListId = paint->getMinikinLocaleListId();
minikinPaint.fontStyle = resolvedFace->fStyle;
minikinPaint.fontFeatureSettings = paint->getFontFeatureSettings();
+ minikinPaint.fontVariationSettings = paint->getFontVariationOverride();
const std::optional<minikin::FamilyVariant>& familyVariant = paint->getFamilyVariant();
if (familyVariant.has_value()) {