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

am c47a0bf3: Merge "restore coverage lost in NotoColorEmoji transition" into klp-dev

Browse Source 
* commit 'c47a0bf3860d41879f94780460af402f4f8d2a46':
  restore coverage lost in NotoColorEmoji transition
This commit is contained in:
Victoria Lease
2013-09-18 16:18:18 -07:00
committed by Android Git Automerger
parent b18e0d1433 c47a0bf386
commit 7ca74d0c5f
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/fonts/Android.mk
View File

@@ -138,7 +138,8 @@ font_src_files += \
DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Regular.ttf \
DroidSansHebrew-Bold.ttf \ DroidSansHebrew-Bold.ttf \
DroidSansArmenian.ttf \ DroidSansArmenian.ttf \
DroidSansGeorgian.ttf DroidSansGeorgian.ttf \
AndroidEmoji.ttf
endif # !MINIMAL_FONT endif # !MINIMAL_FONT

BIN
data/fonts/AndroidEmoji.ttf Normal file
View File

Binary file not shown.

5
data/fonts/fallback_fonts.xml
View File

@@ -184,6 +184,11 @@
<file>NotoSansSymbols-Regular.ttf</file> <file>NotoSansSymbols-Regular.ttf</file>
</fileset> </fileset>
</family> </family>
<family>
<fileset>
<file>AndroidEmoji.ttf</file>
</fileset>
</family>
<family> <family>
<fileset> <fileset>
<file>NotoColorEmoji.ttf</file> <file>NotoColorEmoji.ttf</file>

1
data/fonts/fonts.mk
View File

@@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \
DroidSansMono.ttf \ DroidSansMono.ttf \
DroidSansArmenian.ttf \ DroidSansArmenian.ttf \
DroidSansGeorgian.ttf \ DroidSansGeorgian.ttf \
AndroidEmoji.ttf \
Clockopia.ttf \ Clockopia.ttf \
AndroidClock.ttf \ AndroidClock.ttf \
AndroidClock_Highlight.ttf \ AndroidClock_Highlight.ttf \