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

* commit 'c47a0bf3860d41879f94780460af402f4f8d2a46': restore coverage lost in NotoColorEmoji transition
2013-09-18 16:18:18 -07:00
parent b18e0d1433 c47a0bf386
commit 7ca74d0c5f
4 changed files with 8 additions and 1 deletions
--- 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

--- a/data/fonts/AndroidEmoji.ttf
+++ b/data/fonts/AndroidEmoji.ttf
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -184,6 +184,11 @@
            <file>NotoSansSymbols-Regular.ttf</file>
        </fileset>
    </family>
+    <family>
+        <fileset>
+            <file>AndroidEmoji.ttf</file>
+        </fileset>
+    </family>
    <family>
        <fileset>
            <file>NotoColorEmoji.ttf</file>
--- 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 \