diff options
| author | 2024-09-05 15:33:33 +0900 | |
|---|---|---|
| committer | 2024-09-09 10:57:10 +0900 | |
| commit | 5f4912fedd9cc5ed65a78e18ab68cefa5e2ba6cf (patch) | |
| tree | 1a77a471f4f88efc8a91a6e984037cfb92e3d827 /libs/hwui | |
| parent | 784140a07354af24f4e8724cf68ce9530590d9fd (diff) | |
Remove deprecate_ui_fonts flag
Bug: 279646685
Bug: 364533012
Flag: EXEMPT removing com.android.text.flags.deprecate_ui_fonts
Test: N/A
Change-Id: I2d050e6c36eb2e0d0d3d05ee9ceb63067ae66895
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/FeatureFlags.h | 8 | ||||
| -rw-r--r-- | libs/hwui/hwui/MinikinUtils.cpp | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/libs/hwui/FeatureFlags.h b/libs/hwui/FeatureFlags.h index c0cedf12c0ae..fddcf29b9197 100644 --- a/libs/hwui/FeatureFlags.h +++ b/libs/hwui/FeatureFlags.h @@ -25,14 +25,6 @@ namespace android { namespace text_feature { -inline bool deprecate_ui_fonts() { -#ifdef __ANDROID__ - return com_android_text_flags_deprecate_ui_fonts(); -#else - return true; -#endif // __ANDROID__ -} - inline bool letter_spacing_justification() { #ifdef __ANDROID__ return com_android_text_flags_letter_spacing_justification(); diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp index d66d7f8e83f4..ede385adc779 100644 --- a/libs/hwui/hwui/MinikinUtils.cpp +++ b/libs/hwui/hwui/MinikinUtils.cpp @@ -53,9 +53,7 @@ minikin::MinikinPaint MinikinUtils::prepareMinikinPaint(const Paint* paint, if (familyVariant.has_value()) { minikinPaint.familyVariant = familyVariant.value(); } else { - minikinPaint.familyVariant = text_feature::deprecate_ui_fonts() - ? minikin::FamilyVariant::ELEGANT - : minikin::FamilyVariant::DEFAULT; + minikinPaint.familyVariant = minikin::FamilyVariant::ELEGANT; } return minikinPaint; } |