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

Merge "update noto fonts"

Browse Source
This commit is contained in:
Victoria Lease
2014-05-15 14:46:35 +00:00
committed by Android (Google) Code Review
parent 95f7b135ce a08f0f8f45
commit 4f8beae9de
18 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
data/fonts/Android.mk
View File

@@ -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:
@@ -44,14 +48,6 @@ ifeq ($(SMALLER_FONT_FOOTPRINT),true)
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)
@@ -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

BIN
data/fonts/DroidNaskh-Bold.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidNaskh-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidNaskhUI-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansArabic.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansArmenian.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansEthiopic-Bold.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansEthiopic-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansGeorgian.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansHebrew-Bold.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSansHebrew-Regular.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSerif-Bold.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSerif-BoldItalic.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSerif-Italic.ttf
View File

Binary file not shown.

BIN
data/fonts/DroidSerif-Regular.ttf
View File

Binary file not shown.

71
data/fonts/fallback_fonts.xml
View File

@@ -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>
@@ -144,6 +175,12 @@
<file variant="compact">NotoSansKannadaUI-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansSinhala-Regular.ttf</file>
<file>NotoSansSinhala-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file variant="elegant">NotoSansKhmer-Regular.ttf</file>
@@ -168,6 +205,18 @@
<file variant="compact">NotoSansLaoUI-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<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>NanumGothic.ttf</file>
@@ -175,13 +224,7 @@
</family>
<family>
<fileset>
<file>Padauk-book.ttf</file>
<file>Padauk-bookbold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansSymbols-Regular.ttf</file>
<file>NotoSansSymbols-Regular-Subsetted.ttf</file>
</fileset>
</family>
<family>

10
data/fonts/fonts.mk
View File

@@ -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 \

8
data/fonts/system_fonts.xml
View File

@@ -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>