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

Commit e05d83f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update usage of FontCollection interfaces." into sc-dev am: e13111ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14485568

Change-Id: I82c8427d6c58a61af59a1bba5056ab6019bb6186
parents fff63f08 e13111ba

native/android/system_fonts.cpp

+3 −1
Original line number Diff line number Diff line
@@ -329,7 +329,9 @@ AFont* _Nonnull AFontMatcher_match( 
                static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant),

                1  /* maxRun */);



    const std::shared_ptr<minikin::Font>& font = runs[0].fakedFont.font;

    const std::shared_ptr<minikin::Font>& font =

            fc->getBestFont(minikin::U16StringPiece(text, textLength), runs[0], matcher->mFontStyle)

                    .font;

    std::unique_ptr<AFont> result = std::make_unique<AFont>();

    const android::MinikinFontSkia* minikinFontSkia =

            reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get());