Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a057690 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't apply hard coded vertical metrics if target SDK is 35 or later" into main

parents a7b0ff88 c6d3e0b1
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -619,7 +619,16 @@ namespace PaintGlue {
        // restore the original settings.
        font->setSkewX(saveSkewX);
        font->setEmbolden(savefakeBold);
        if (paint->getFamilyVariant() == minikin::FamilyVariant::ELEGANT) {

        // Don't use hard coded vertical metrics if target SDK is 35 or later.
#ifdef __ANDROID__
        uint32_t isTargetSdk35OrLater = android_get_application_target_sdk_version() >= 35;
#else
        uint32_t isTargetSdk35OrLater = true;
#endif  // __ANDROID
        bool useHardCodedMetrics = !isTargetSdk35OrLater &&
                                   (paint->getFamilyVariant() == minikin::FamilyVariant::ELEGANT);
        if (useHardCodedMetrics) {
            SkScalar size = font->getSize();
            metrics->fTop = -size * kElegantTop / 2048;
            metrics->fBottom = -size * kElegantBottom / 2048;