diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-26 18:59:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 18:59:15 +0000 |
| commit | 4de32b2fb2c1b1e80593f2efc1c0108d3a8da027 (patch) | |
| tree | ef6f44da5145bcbbcd404e98106f5798a3cee0bb | |
| parent | 79f73eea4bce47d9ea515a8eddb31481b53fcefa (diff) | |
| parent | 2fb99930fcee67dae0b143c13557aeaef367e2a3 (diff) | |
| download | recovery-temp_RQ2A.210305.007.tar.gz | |
Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fctemp_RQ2A.210305.007
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90dcd247e1541f3bf7f16d95c7cef6256ae462aa
| -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 1da43e5c..d96a8618 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-Regular"); - put("ar", "NotoNaskhArabicUI-Regular"); + put("am", "NotoSansEthiopic"); + put("ar", "NotoNaskhArabicUI"); put("as", "NotoSansBengaliUI-Regular"); put("bn", "NotoSansBengaliUI-Regular"); - put("fa", "NotoNaskhArabicUI-Regular"); - put("gu", "NotoSansGujaratiUI-Regular"); + put("fa", "NotoNaskhArabicUI"); + put("gu", "NotoSansGujaratiUI"); put("hi", "NotoSansDevanagariUI-Regular"); put("hy", "NotoSansArmenian-Regular"); - 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("iw", "NotoSansHebrew"); + put("ja", "NotoSansCJKjp-Regular"); + put("ka", "NotoSansGeorgian-Regular"); + put("ko", "NotoSansCJKjp-Regular"); + put("km", "NotoSansKhmerUI"); + put("kn", "NotoSansKannadaUI"); + put("lo", "NotoSansLaoUI"); put("ml", "NotoSansMalayalamUI-Regular"); put("mr", "NotoSansDevanagariUI-Regular"); put("my", "NotoSansMyanmarUI-Regular"); put("ne", "NotoSansDevanagariUI-Regular"); - put("or", "NotoSansOriya-Regular"); - put("pa", "NotoSansGurmukhiUI-Regular"); + put("or", "NotoSansOriya"); + put("pa", "NotoSansGurmukhiUI"); put("si", "NotoSansSinhala-Regular"); put("ta", "NotoSansTamilUI-Regular"); - put("te", "NotoSansTeluguUI-Regular"); - put("th", "NotoSansThaiUI-Regular"); - put("ur", "NotoNaskhArabicUI-Regular"); - put("zh", "NotoSansCJK-Regular"); + put("te", "NotoSansTeluguUI"); + put("th", "NotoSansThaiUI"); + put("ur", "NotoNaskhArabicUI"); + put("zh", "NotoSansCJKjp-Regular"); } }; @@ -386,7 +386,7 @@ public class ImageGenerator { } String fontName = LANGUAGE_TO_FONT_MAP.getOrDefault(language, DEFAULT_FONT_NAME); - String[] suffixes = {".otf", ".ttf", ".ttc"}; + String[] suffixes = {".otf", ".ttf", ".ttc", ".otc"}; for (String suffix : suffixes) { File fontFile = new File(mFontDirPath, fontName + suffix); if (fontFile.isFile()) { |