drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev

Browse Source 
* commit '22e2c2254244da4cf9ead06a6d03dc21b54d2a8a':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
This commit is contained in:
Victoria Lease
2013-09-13 17:15:03 -07:00
committed by Android Git Automerger
parent 649bb2dc30 22e2c22542
commit fff3f7cc82
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/fonts/Android.mk
View File

@ -138,8 +138,7 @@ 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
View File

Binary file not shown.

2
data/fonts/fallback_fonts.xml
View File

@ -186,7 +186,7 @@
</family> </family>
<family> <family>
<fileset> <fileset>
<file>AndroidEmoji.ttf</file> <file>NotoColorEmoji.ttf</file>
</fileset> </fileset>
</family> </family>
<family> <family>

1
data/fonts/fonts.mk
View File

@ -43,7 +43,6 @@ 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 \