summaryrefslogtreecommitdiffstats
path: root/tools/image_generator
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-02-24 21:00:16 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-24 21:00:16 +0100
commit2e72f0af9d622040772b3e2fe8a620022578a277 (patch)
treee70815760d1299579d7ecbf0df471d2bf2fa6337 /tools/image_generator
parent[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e -s ours am: 8d12226c10 -s ours (diff)
parentUpdate ImageGenerator to match the latest font names. (diff)
downloadandroid_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar.gz
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar.bz2
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar.lz
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar.xz
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.tar.zst
android_bootable_recovery-2e72f0af9d622040772b3e2fe8a620022578a277.zip
Diffstat (limited to 'tools/image_generator')
-rw-r--r--tools/image_generator/ImageGenerator.java54
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java
index 6c5ea4b5f..8cc40c6b5 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-VF");
- put("ar", "NotoNaskhArabicUI-Regular");
- put("as", "NotoSansBengaliUI-VF");
- put("bn", "NotoSansBengaliUI-VF");
- put("fa", "NotoNaskhArabicUI-Regular");
- put("gu", "NotoSansGujaratiUI-Regular");
- put("hi", "NotoSansDevanagariUI-VF");
- put("hy", "NotoSansArmenian-VF");
- put("iw", "NotoSansHebrew-Regular");
- put("ja", "NotoSansCJK-Regular");
- put("ka", "NotoSansGeorgian-VF");
- put("ko", "NotoSansCJK-Regular");
- put("km", "NotoSansKhmerUI-Regular");
- put("kn", "NotoSansKannadaUI-VF");
- put("lo", "NotoSansLaoUI-Regular");
- put("ml", "NotoSansMalayalamUI-VF");
- put("mr", "NotoSansDevanagariUI-VF");
+ put("am", "NotoSansEthiopic-Regular");
+ put("ar", "NotoNaskhArabicUI");
+ put("as", "NotoSansBengaliUI-Regular");
+ put("bn", "NotoSansBengaliUI-Regular");
+ put("fa", "NotoNaskhArabicUI");
+ put("gu", "NotoSansGujaratiUI");
+ 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-Regular");
+ put("lo", "NotoSansLaoUI");
+ put("ml", "NotoSansMalayalamUI-Regular");
+ put("mr", "NotoSansDevanagariUI-Regular");
put("my", "NotoSansMyanmarUI-Regular");
- put("ne", "NotoSansDevanagariUI-VF");
- put("or", "NotoSansOriya-Regular");
- put("pa", "NotoSansGurmukhiUI-VF");
- put("si", "NotoSansSinhalaUI-VF");
- put("ta", "NotoSansTamilUI-VF");
- put("te", "NotoSansTeluguUI-VF");
- put("th", "NotoSansThaiUI-Regular");
- put("ur", "NotoNaskhArabicUI-Regular");
- put("zh", "NotoSansCJK-Regular");
+ put("ne", "NotoSansDevanagariUI-Regular");
+ put("or", "NotoSansOriya");
+ put("pa", "NotoSansGurmukhiUI-Regular");
+ put("si", "NotoSansSinhalaUI-Regular");
+ put("ta", "NotoSansTamilUI-Regular");
+ put("te", "NotoSansTeluguUI-Regular");
+ 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()) {