summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/fonts/Android.mk3
-rw-r--r--data/fonts/AndroidEmoji.ttfbin0 -> 2748 bytes
-rw-r--r--data/fonts/fallback_fonts.xml5
-rw-r--r--data/fonts/fonts.mk1
4 files changed, 8 insertions, 1 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 2846e61..0d9a386 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -138,7 +138,8 @@ font_src_files += \
DroidSansHebrew-Regular.ttf \
DroidSansHebrew-Bold.ttf \
DroidSansArmenian.ttf \
- DroidSansGeorgian.ttf
+ DroidSansGeorgian.ttf \
+ AndroidEmoji.ttf
endif # !MINIMAL_FONT
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
new file mode 100644
index 0000000..98f72e7
--- /dev/null
+++ b/data/fonts/AndroidEmoji.ttf
Binary files differ
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 69db6aa..ede7ef4 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -186,6 +186,11 @@
</family>
<family>
<fileset>
+ <file>AndroidEmoji.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>NotoColorEmoji.ttf</file>
</fileset>
</family>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index a677c4f..05cca13 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \
DroidSansMono.ttf \
DroidSansArmenian.ttf \
DroidSansGeorgian.ttf \
+ AndroidEmoji.ttf \
Clockopia.ttf \
AndroidClock.ttf \
AndroidClock_Highlight.ttf \