diff options
| author | 2024-02-07 01:18:20 +0000 | |
|---|---|---|
| committer | 2024-02-07 01:18:20 +0000 | |
| commit | 455a73815e8b6840e8b174a5f90bef0ce2c6eb54 (patch) | |
| tree | e36a357bbb141974b6bc485d26f51ddca40e9bf9 /libs | |
| parent | 3562e45e09052e5871cf51b18420ed94f1ae1f45 (diff) | |
| parent | d86ba1ee96f8bb3e95353cb20bf7d2b515786ca9 (diff) | |
Merge "Rename feature flag for inter character justification" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/FeatureFlags.h | 4 | ||||
| -rw-r--r-- | libs/hwui/hwui/MinikinUtils.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/FeatureFlags.h b/libs/hwui/FeatureFlags.h index 6ebfc63bdf26..ac75c077b58f 100644 --- a/libs/hwui/FeatureFlags.h +++ b/libs/hwui/FeatureFlags.h @@ -41,9 +41,9 @@ inline bool deprecate_ui_fonts() { #endif // __ANDROID__ } -inline bool inter_character_justification() { +inline bool letter_spacing_justification() { #ifdef __ANDROID__ - return com_android_text_flags_inter_character_justification(); + return com_android_text_flags_letter_spacing_justification(); #else return true; #endif // __ANDROID__ diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp index 56133699d5f5..d66d7f8e83f4 100644 --- a/libs/hwui/hwui/MinikinUtils.cpp +++ b/libs/hwui/hwui/MinikinUtils.cpp @@ -72,7 +72,7 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, minikin::Bidi bidiFla const minikin::Range contextRange(contextStart, contextStart + contextCount); const minikin::StartHyphenEdit startHyphen = paint->getStartHyphenEdit(); const minikin::EndHyphenEdit endHyphen = paint->getEndHyphenEdit(); - const minikin::RunFlag minikinRunFlag = text_feature::inter_character_justification() + const minikin::RunFlag minikinRunFlag = text_feature::letter_spacing_justification() ? paint->getRunFlag() : minikin::RunFlag::NONE; @@ -105,7 +105,7 @@ float MinikinUtils::measureText(const Paint* paint, minikin::Bidi bidiFlags, const minikin::Range range(start, start + count); const minikin::StartHyphenEdit startHyphen = paint->getStartHyphenEdit(); const minikin::EndHyphenEdit endHyphen = paint->getEndHyphenEdit(); - const minikin::RunFlag minikinRunFlag = text_feature::inter_character_justification() + const minikin::RunFlag minikinRunFlag = text_feature::letter_spacing_justification() ? paint->getRunFlag() : minikin::RunFlag::NONE; |