diff options
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 22 | ||||
| -rw-r--r-- | data/fonts/DroidSansFallback.ttf | bin | 3939852 -> 3939384 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansFallbackFull.ttf | bin | 4529044 -> 4528576 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansFallbackLegacy.ttf | bin | 3081908 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/Roboto-BlackItalic.ttf | bin | 0 -> 134716 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 35 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 | ||||
| -rw-r--r-- | data/fonts/system_fonts.xml | 1 |
8 files changed, 52 insertions, 7 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index c6bccfe..6437e07 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -42,12 +42,21 @@ $(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)) +extra_font_files := \ + DroidSans.ttf \ + DroidSans-Bold.ttf + ################################ # On space-constrained devices, we include a subset of fonts: ifeq ($(SMALLER_FONT_FOOTPRINT),true) + droidsans_fallback_src := DroidSansFallback.ttf -extra_font_files := DroidSans.ttf DroidSans-Bold.ttf -else + +else # !SMALLER_FONT_FOOTPRINT + +droidsans_fallback_src := DroidSansFallbackFull.ttf + +ifneq ($(EXTENDED_FONT_FOOTPRINT),true) include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf LOCAL_SRC_FILES := $(LOCAL_MODULE) @@ -55,12 +64,9 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) +extra_font_files += MTLmr3m.ttf +endif # !EXTENDED_FONT_FOOTPRINT -droidsans_fallback_src := DroidSansFallbackFull.ttf -extra_font_files := \ - DroidSans.ttf \ - DroidSans-Bold.ttf \ - MTLmr3m.ttf endif # SMALLER_FONT_FOOTPRINT ################################ @@ -106,6 +112,7 @@ font_src_files := \ ifeq ($(MINIMAL_FONT_FOOTPRINT),true) $(eval $(call create-font-symlink,Roboto-Black.ttf,Roboto-Bold.ttf)) +$(eval $(call create-font-symlink,Roboto-BlackItalic.ttf,Roboto-BoldItalic.ttf)) $(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf)) $(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf)) $(eval $(call create-font-symlink,Roboto-Medium.ttf,Roboto-Regular.ttf)) @@ -120,6 +127,7 @@ $(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItal else # !MINIMAL_FONT font_src_files += \ Roboto-Black.ttf \ + Roboto-BlackItalic.ttf \ Roboto-Light.ttf \ Roboto-LightItalic.ttf \ Roboto-Medium.ttf \ diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf Binary files differindex 2b75113..8e70e80 100644 --- a/data/fonts/DroidSansFallback.ttf +++ b/data/fonts/DroidSansFallback.ttf diff --git a/data/fonts/DroidSansFallbackFull.ttf b/data/fonts/DroidSansFallbackFull.ttf Binary files differindex a9df005..68d2751 100644 --- a/data/fonts/DroidSansFallbackFull.ttf +++ b/data/fonts/DroidSansFallbackFull.ttf diff --git a/data/fonts/DroidSansFallbackLegacy.ttf b/data/fonts/DroidSansFallbackLegacy.ttf Binary files differdeleted file mode 100644 index 61460b1..0000000 --- a/data/fonts/DroidSansFallbackLegacy.ttf +++ /dev/null diff --git a/data/fonts/Roboto-BlackItalic.ttf b/data/fonts/Roboto-BlackItalic.ttf Binary files differnew file mode 100644 index 0000000..3ebdc7d --- /dev/null +++ b/data/fonts/Roboto-BlackItalic.ttf diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index c2d5afe..37e9b15 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -219,6 +219,41 @@ </family> <family> <fileset> + <file>NotoSansCherokee-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansCanadianAboriginal-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansYi-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file lang="zh-CN">NotoSansHans-Regular.otf</file> + </fileset> + </family> + <family> + <fileset> + <file lang="zh-TW">NotoSansHant-Regular.otf</file> + </fileset> + </family> + <family> + <fileset> + <file lang="ja">NotoSansJP-Regular.otf</file> + </fileset> + </family> + <family> + <fileset> + <file lang="ko">NotoSansKR-Regular.otf</file> + </fileset> + </family> + <family> + <fileset> <file>NanumGothic.ttf</file> </fileset> </family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index e5573bb..70fc6a2 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -25,6 +25,7 @@ PRODUCT_PACKAGES := \ Roboto-Italic.ttf \ Roboto-BoldItalic.ttf \ Roboto-Black.ttf \ + Roboto-BlackItalic.ttf \ Roboto-Light.ttf \ Roboto-LightItalic.ttf \ Roboto-Medium.ttf \ diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 646b33b..8c59fea 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -82,6 +82,7 @@ </nameset> <fileset> <file>Roboto-Black.ttf</file> + <file>Roboto-BlackItalic.ttf</file> </fileset> </family> |