From e105751292c677bd4afb317579b51dc91fc42b37 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 31 Mar 2021 20:36:20 +0000 Subject: Revert "Update ImageGenerator to match the latest font names." Revert "Rename font file with PostScript based names" Revert submission 1606485-rename_fonts Reason for revert: font file name requirement was removed. Reverted Changes: Iab8b9d65a:Update ImageGenerator to match the latest font nam... Ifbe99d68c:Rename the font file with PostScript name based fi... I307c21531:Rename font file with PostScript based names Change-Id: Ic8174b4a4a736d9079dee4106bdfa5c440f877bb Merged-In: I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 --- tools/image_generator/ImageGenerator.java | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tools') 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 LANGUAGE_TO_FONT_MAP = new TreeMap() { { - 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()) { -- cgit v1.2.3