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

Commit 4810c99f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd833 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606

Change-Id: Ib1a6d554c29ca3d8fb227c7a153bf810373e9922
parents b845427d 853dd833

tools/image_generator/ImageGenerator.java

+18 −18
Original line number Diff line number Diff line
@@ -113,33 +113,33 @@ public class ImageGenerator { 
    private static final Map<String, String> LANGUAGE_TO_FONT_MAP =

            new TreeMap<String, String>() {

                {

                    put("am", "NotoSansEthiopic");

                    put("ar", "NotoNaskhArabicUI");

                    put("am", "NotoSansEthiopic-Regular");

                    put("ar", "NotoNaskhArabicUI-Regular");

                    put("as", "NotoSansBengaliUI-Regular");

                    put("bn", "NotoSansBengaliUI-Regular");

                    put("fa", "NotoNaskhArabicUI");

                    put("gu", "NotoSansGujaratiUI");

                    put("fa", "NotoNaskhArabicUI-Regular");

                    put("gu", "NotoSansGujaratiUI-Regular");

                    put("hi", "NotoSansDevanagariUI-Regular");

                    put("hy", "NotoSansArmenian-Regular");

                    put("iw", "NotoSansHebrew");

                    put("ja", "NotoSansCJKjp-Regular");

                    put("ka", "NotoSansGeorgian-Regular");

                    put("ko", "NotoSansCJKjp-Regular");

                    put("km", "NotoSansKhmerUI");

                    put("kn", "NotoSansKannadaUI");

                    put("lo", "NotoSansLaoUI");

                    put("iw", "NotoSansHebrew-Regular");

                    put("ja", "NotoSansCJK-Regular");

                    put("ka", "NotoSansGeorgian-VF");

                    put("ko", "NotoSansCJK-Regular");

                    put("km", "NotoSansKhmerUI-Regular");

                    put("kn", "NotoSansKannadaUI-Regular");

                    put("lo", "NotoSansLaoUI-Regular");

                    put("ml", "NotoSansMalayalamUI-Regular");

                    put("mr", "NotoSansDevanagariUI-Regular");

                    put("my", "NotoSansMyanmarUI-Regular");

                    put("ne", "NotoSansDevanagariUI-Regular");

                    put("or", "NotoSansOriya");

                    put("pa", "NotoSansGurmukhiUI");

                    put("or", "NotoSansOriya-Regular");

                    put("pa", "NotoSansGurmukhiUI-Regular");

                    put("si", "NotoSansSinhala-Regular");

                    put("ta", "NotoSansTamilUI-Regular");

                    put("te", "NotoSansTeluguUI");

                    put("th", "NotoSansThaiUI");

                    put("ur", "NotoNaskhArabicUI");

                    put("zh", "NotoSansCJKjp-Regular");

                    put("te", "NotoSansTeluguUI-Regular");

                    put("th", "NotoSansThaiUI-Regular");

                    put("ur", "NotoNaskhArabicUI-Regular");

                    put("zh", "NotoSansCJK-Regular");

                }

            };
@@ -386,7 +386,7 @@ public class ImageGenerator { 
        }



        String fontName = LANGUAGE_TO_FONT_MAP.getOrDefault(language, DEFAULT_FONT_NAME);

        String[] suffixes = {".otf", ".ttf", ".ttc", ".otc"};

        String[] suffixes = {".otf", ".ttf", ".ttc"};

        for (String suffix : suffixes) {

            File fontFile = new File(mFontDirPath, fontName + suffix);

            if (fontFile.isFile()) {