diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-01 00:16:54 +0200 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 00:16:54 +0200 |
| commit | 4810c99f095a7530bdc590742fa90d8369e6b6dd (patch) | |
| tree | 677b33e33b59a31ec956048e512dbd6a7c6a09b6 | |
| parent | Merge "Bring up the erase animation early for data wipe" am: 8082b71f45 (diff) | |
| parent | Merge "Revert "Update ImageGenerator to match the latest font names."" (diff) | |
| download | android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar.gz android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar.bz2 android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar.lz android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar.xz android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.tar.zst android_bootable_recovery-4810c99f095a7530bdc590742fa90d8369e6b6dd.zip | |
| -rw-r--r-- | tools/image_generator/ImageGenerator.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index d96a86189..1da43e5c6 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -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()) { |