diff options
18 files changed, 63 insertions, 45 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 97c1b33b5c9d..452c5758cf51 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -33,10 +33,14 @@ ALL_MODULES.$(1).INSTALLED := \ endef ########################################## -# We may only afford small font footprint. +# The following fonts are distributed as symlink only. ########################################## $(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf)) $(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf)) +$(eval $(call create-font-symlink,DroidSerif-Regular.ttf,NotoSerif-Regular.ttf)) +$(eval $(call create-font-symlink,DroidSerif-Bold.ttf,NotoSerif-Bold.ttf)) +$(eval $(call create-font-symlink,DroidSerif-Italic.ttf,NotoSerif-Italic.ttf)) +$(eval $(call create-font-symlink,DroidSerif-BoldItalic.ttf,NotoSerif-BoldItalic.ttf)) ################################ # On space-constrained devices, we include a subset of fonts: @@ -45,14 +49,6 @@ droidsans_fallback_src := DroidSansFallback.ttf extra_font_files := DroidSans.ttf DroidSans-Bold.ttf else include $(CLEAR_VARS) -LOCAL_MODULE := DroidSansEthiopic-Regular.ttf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC @@ -64,7 +60,6 @@ droidsans_fallback_src := DroidSansFallbackFull.ttf extra_font_files := \ DroidSans.ttf \ DroidSans-Bold.ttf \ - DroidSansEthiopic-Regular.ttf \ MTLmr3m.ttf endif # SMALLER_FONT_FOOTPRINT @@ -102,10 +97,6 @@ font_src_files := \ Roboto-Bold.ttf \ Roboto-Italic.ttf \ Roboto-BoldItalic.ttf \ - DroidSerif-Regular.ttf \ - DroidSerif-Bold.ttf \ - DroidSerif-Italic.ttf \ - DroidSerif-BoldItalic.ttf \ DroidSansMono.ttf \ Clockopia.ttf \ AndroidClock.ttf \ @@ -135,12 +126,6 @@ font_src_files += \ RobotoCondensed-BoldItalic.ttf \ RobotoCondensed-Light.ttf \ RobotoCondensed-LightItalic.ttf \ - DroidNaskh-Regular.ttf \ - DroidNaskhUI-Regular.ttf \ - DroidSansHebrew-Regular.ttf \ - DroidSansHebrew-Bold.ttf \ - DroidSansArmenian.ttf \ - DroidSansGeorgian.ttf \ AndroidEmoji.ttf endif # !MINIMAL_FONT diff --git a/data/fonts/DroidNaskh-Bold.ttf b/data/fonts/DroidNaskh-Bold.ttf Binary files differdeleted file mode 100644 index 14d8768ff792..000000000000 --- a/data/fonts/DroidNaskh-Bold.ttf +++ /dev/null diff --git a/data/fonts/DroidNaskh-Regular.ttf b/data/fonts/DroidNaskh-Regular.ttf Binary files differdeleted file mode 100644 index 03662f2c4bff..000000000000 --- a/data/fonts/DroidNaskh-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidNaskhUI-Regular.ttf b/data/fonts/DroidNaskhUI-Regular.ttf Binary files differdeleted file mode 100644 index c961de204afa..000000000000 --- a/data/fonts/DroidNaskhUI-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidSansArabic.ttf b/data/fonts/DroidSansArabic.ttf Binary files differdeleted file mode 100644 index bdefaacb04df..000000000000 --- a/data/fonts/DroidSansArabic.ttf +++ /dev/null diff --git a/data/fonts/DroidSansArmenian.ttf b/data/fonts/DroidSansArmenian.ttf Binary files differdeleted file mode 100644 index 6fafa5411e9a..000000000000 --- a/data/fonts/DroidSansArmenian.ttf +++ /dev/null diff --git a/data/fonts/DroidSansEthiopic-Bold.ttf b/data/fonts/DroidSansEthiopic-Bold.ttf Binary files differdeleted file mode 100644 index e06cac2a53b0..000000000000 --- a/data/fonts/DroidSansEthiopic-Bold.ttf +++ /dev/null diff --git a/data/fonts/DroidSansEthiopic-Regular.ttf b/data/fonts/DroidSansEthiopic-Regular.ttf Binary files differdeleted file mode 100644 index 0adcbbee52a1..000000000000 --- a/data/fonts/DroidSansEthiopic-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidSansGeorgian.ttf b/data/fonts/DroidSansGeorgian.ttf Binary files differdeleted file mode 100644 index 3a2e9fbc839a..000000000000 --- a/data/fonts/DroidSansGeorgian.ttf +++ /dev/null diff --git a/data/fonts/DroidSansHebrew-Bold.ttf b/data/fonts/DroidSansHebrew-Bold.ttf Binary files differdeleted file mode 100644 index c1acb38df569..000000000000 --- a/data/fonts/DroidSansHebrew-Bold.ttf +++ /dev/null diff --git a/data/fonts/DroidSansHebrew-Regular.ttf b/data/fonts/DroidSansHebrew-Regular.ttf Binary files differdeleted file mode 100644 index af6a58d8a500..000000000000 --- a/data/fonts/DroidSansHebrew-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf Binary files differdeleted file mode 100644 index 16a914e2f6fd..000000000000 --- a/data/fonts/DroidSerif-Bold.ttf +++ /dev/null diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf Binary files differdeleted file mode 100644 index 50324fc1640c..000000000000 --- a/data/fonts/DroidSerif-BoldItalic.ttf +++ /dev/null diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf Binary files differdeleted file mode 100644 index bb2757cdc378..000000000000 --- a/data/fonts/DroidSerif-Italic.ttf +++ /dev/null diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf Binary files differdeleted file mode 100644 index da0a2cc3b7fa..000000000000 --- a/data/fonts/DroidSerif-Regular.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index ede7ef47d22c..c2d5afef55bc 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -31,23 +31,26 @@ <familyset> <family> <fileset> - <file variant="elegant">DroidNaskh-Regular.ttf</file> + <file variant="elegant">NotoNaskh-Regular.ttf</file> + <file variant="elegant">NotoNaskh-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file variant="compact">DroidNaskhUI-Regular.ttf</file> + <file variant="compact">NotoNaskhUI-Regular.ttf</file> + <file variant="compact">NotoNaskhUI-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file>DroidSansEthiopic-Regular.ttf</file> + <file>NotoSansEthiopic-Regular.ttf</file> + <file>NotoSansEthiopic-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file>DroidSansHebrew-Regular.ttf</file> - <file>DroidSansHebrew-Bold.ttf</file> + <file>NotoSansHebrew-Regular.ttf</file> + <file>NotoSansHebrew-Bold.ttf</file> </fileset> </family> <family> @@ -64,12 +67,14 @@ </family> <family> <fileset> - <file>DroidSansArmenian.ttf</file> + <file>NotoSansArmenian-Regular.ttf</file> + <file>NotoSansArmenian-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file>DroidSansGeorgian.ttf</file> + <file>NotoSansGeorgian-Regular.ttf</file> + <file>NotoSansGeorgian-Bold.ttf</file> </fileset> </family> <family> @@ -84,6 +89,32 @@ <file variant="compact">NotoSansDevanagariUI-Bold.ttf</file> </fileset> </family> + <!-- Gujarati should come after Devanagari --> + <family> + <fileset> + <file variant="elegant">NotoSansGujarati-Regular.ttf</file> + <file variant="elegant">NotoSansGujarati-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansGujaratiUI-Regular.ttf</file> + <file variant="compact">NotoSansGujaratiUI-Bold.ttf</file> + </fileset> + </family> + <!-- Gurmukhi should come after Devanagari --> + <family> + <fileset> + <file variant="elegant">NotoSansGurmukhi-Regular.ttf</file> + <file variant="elegant">NotoSansGurmukhi-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansGurmukhiUI-Regular.ttf</file> + <file variant="compact">NotoSansGurmukhiUI-Bold.ttf</file> + </fileset> + </family> <family> <fileset> <file variant="elegant">NotoSansTamil-Regular.ttf</file> @@ -146,6 +177,12 @@ </family> <family> <fileset> + <file>NotoSansSinhala-Regular.ttf</file> + <file>NotoSansSinhala-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> <file variant="elegant">NotoSansKhmer-Regular.ttf</file> <file variant="elegant">NotoSansKhmer-Bold.ttf</file> </fileset> @@ -170,18 +207,24 @@ </family> <family> <fileset> - <file>NanumGothic.ttf</file> + <file variant="elegant">NotoSansMyanmar-Regular.ttf</file> + <file variant="elegant">NotoSansMyanmar-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansMyanmarUI-Regular.ttf</file> + <file variant="compact">NotoSansMyanmarUI-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file>Padauk-book.ttf</file> - <file>Padauk-bookbold.ttf</file> + <file>NanumGothic.ttf</file> </fileset> </family> <family> <fileset> - <file>NotoSansSymbols-Regular.ttf</file> + <file>NotoSansSymbols-Regular-Subsetted.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 293ecc8a36ab..2312a04a5343 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -34,17 +34,7 @@ PRODUCT_PACKAGES := \ RobotoCondensed-BoldItalic.ttf \ RobotoCondensed-Light.ttf \ RobotoCondensed-LightItalic.ttf \ - DroidNaskh-Regular.ttf \ - DroidNaskhUI-Regular.ttf \ - DroidSansHebrew-Regular.ttf \ - DroidSansHebrew-Bold.ttf \ - DroidSerif-Regular.ttf \ - DroidSerif-Bold.ttf \ - DroidSerif-Italic.ttf \ - DroidSerif-BoldItalic.ttf \ DroidSansMono.ttf \ - DroidSansArmenian.ttf \ - DroidSansGeorgian.ttf \ AndroidEmoji.ttf \ Clockopia.ttf \ AndroidClock.ttf \ diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index a8d23ee6cbc2..97b7fd85078b 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -89,10 +89,10 @@ <name>ITC Stone Serif</name> </nameset> <fileset> - <file>DroidSerif-Regular.ttf</file> - <file>DroidSerif-Bold.ttf</file> - <file>DroidSerif-Italic.ttf</file> - <file>DroidSerif-BoldItalic.ttf</file> + <file>NotoSerif-Regular.ttf</file> + <file>NotoSerif-Bold.ttf</file> + <file>NotoSerif-Italic.ttf</file> + <file>NotoSerif-BoldItalic.ttf</file> </fileset> </family> |