summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-07 02:31:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-07 02:31:41 +0000
commit954e82ad137edd19b29c62a0f7b4431d3b107e87 (patch)
tree96f0823368128d2a355390a2635e9685288140f9
parent1cf4290cbabc2cc70961ca95c9b8187b6e7132c6 (diff)
parent16a74e092f12b648a9c7abe27193f75aa87e6c3d (diff)
Merge "Connect stored variation settings to Minikin" into main
-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()) {