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

* commit '22e2c2254244da4cf9ead06a6d03dc21b54d2a8a': NotoColorEmoji.ttf is the new AndroidEmoji.ttf
2013-09-13 17:15:03 -07:00
parent 649bb2dc30 22e2c22542
commit fff3f7cc82
4 changed files with 2 additions and 4 deletions
--- 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

--- a/data/fonts/AndroidEmoji.ttf
+++ b/data/fonts/AndroidEmoji.ttf
--- 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>
--- 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 \