NotoColorEmoji.ttf is the new AndroidEmoji.ttf

Bug: 10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 0d9a386..2846e61 100644 (file)
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -138,8 +138,7 @@ font_src_files += \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \
     DroidSansArmenian.ttf \
-    DroidSansGeorgian.ttf \
-    AndroidEmoji.ttf
+    DroidSansGeorgian.ttf
 
 endif # !MINIMAL_FONT
 

diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
deleted file mode 100644 (file)
index 569cbab..0000000
Binary files a/data/fonts/AndroidEmoji.ttf and /dev/null differ

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 1198aba..69db6aa 100644 (file)
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -186,7 +186,7 @@
     </family>
     <family>
         <fileset>
-            <file>AndroidEmoji.ttf</file>
+            <file>NotoColorEmoji.ttf</file>
         </fileset>
     </family>
     <family>

diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 05cca13..a677c4f 100644 (file)
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -43,7 +43,6 @@ PRODUCT_PACKAGES := \
     DroidSansMono.ttf \
     DroidSansArmenian.ttf \
     DroidSansGeorgian.ttf \
-    AndroidEmoji.ttf \
     Clockopia.ttf \
     AndroidClock.ttf \
     AndroidClock_Highlight.ttf \