diff options
| author | Victoria Lease <violets@google.com> | 2014-06-13 07:56:58 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2014-06-16 14:10:03 -0700 |
| commit | f99c12cee55bae44bbac0a943a18b5121c007101 (patch) | |
| tree | 105f8dc723b534764a8161dff1ad068bfe0a22a3 /data/fonts | |
| parent | 5d140e4b1b1d43c742a7d67dd5f9d394c846945f (diff) | |
| download | frameworks_base-f99c12cee55bae44bbac0a943a18b5121c007101.zip frameworks_base-f99c12cee55bae44bbac0a943a18b5121c007101.tar.gz frameworks_base-f99c12cee55bae44bbac0a943a18b5121c007101.tar.bz2 | |
use Noto Sans CJK fonts for EXTENDED_FONT_FOOTPRINT builds
Bug: 15569561
Change-Id: I1b8f1a9dde0a15d9bb2aa2bbe92e8c6a46d8dfc6
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 20 | ||||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 20 |
2 files changed, 33 insertions, 7 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index abb960c..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 ################################ diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index c2d5afe..1eaae65 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -219,6 +219,26 @@ </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> |