From 16a74e092f12b648a9c7abe27193f75aa87e6c3d Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Sat, 3 Aug 2024 13:34:42 +0900
Subject: Connect stored variation settings to Minikin

Bug: 361260253
Test: minikin_tests
Flag: com.android.text.flags.typeface_redesign
Change-Id: I69218ca84b66e4d0a2b3bc4ec5fbc8c20ef105d6
---
 libs/hwui/hwui/MinikinUtils.cpp | 1 +
 1 file changed, 1 insertion(+)

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()) {
-- 
cgit v1.2.3-59-g8ed1b