Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use NotoSansCJK-Regular.ttc instead of separated font files."

Browse Source
This commit is contained in:
Seigo Nonaka
2015-12-11 20:41:33 +00:00
committed by Android (Google) Code Review
parent 2fa2791583 c73b2257ad
commit 671e581eb0
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/fonts/Android.mk
View File

@@ -17,11 +17,6 @@
LOCAL_PATH := $(call my-dir)
# Use full Noto Sans Japanese font on non-smaller footprints
ifneq ($(SMALLER_FONT_FOOTPRINT),true)
FONT_NOTOSANS_JP_FULL := true
endif
##########################################
# create symlink for given font
# $(1): new font $(2): link target
@@ -51,24 +46,6 @@ extra_font_files := \
DroidSans.ttf \
DroidSans-Bold.ttf
################################
# Do not include Motoya on space-constrained devices
ifneq ($(SMALLER_FONT_FOOTPRINT),true)
# Do not include Motoya if we are including Noto Sans Japanese
ifneq ($(FONT_NOTOSANS_JP_FULL),true)
include $(CLEAR_VARS)
LOCAL_MODULE := MTLmr3m.ttf
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
include $(BUILD_PREBUILT)
extra_font_files += MTLmr3m.ttf
endif # !FONT_NOTOSANS_JP_FULL
endif # !SMALLER_FONT_FOOTPRINT
################################
# Use DroidSansMono to hang extra_font_files on
include $(CLEAR_VARS)

11
data/fonts/fonts.xml
View File

@@ -330,16 +330,16 @@
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
</family>
<family lang="zh-Hans">
<font weight="400" style="normal">NotoSansSC-Regular.otf</font>
<font weight="400" style="normal" ttcIndex="2">NotoSansCJK-Regular.ttc</font>
</family>
<family lang="zh-Hant">
<font weight="400" style="normal">NotoSansTC-Regular.otf</font>
<font weight="400" style="normal" ttcIndex="3">NotoSansCJK-Regular.ttc</font>
</family>
<family lang="ja">
<font weight="400" style="normal">NotoSansJP-Regular.otf</font>
<font weight="400" style="normal" ttcIndex="0">NotoSansCJK-Regular.ttc</font>
</family>
<family lang="ko">
<font weight="400" style="normal">NotoSansKR-Regular.otf</font>
<font weight="400" style="normal" ttcIndex="1">NotoSansCJK-Regular.ttc</font>
</family>
<family>
<font weight="400" style="normal">NanumGothic.ttf</font>
@@ -350,9 +350,6 @@
<family>
<font weight="400" style="normal">DroidSansFallback.ttf</font>
</family>
<family lang="ja">
<font weight="400" style="normal">MTLmr3m.ttf</font>
</family>
<!--
Tai Le and Mongolian are intentionally kept last, to make sure they don't override
the East Asian punctuation for Chinese.