Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00315e2e authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

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

* commit '7ca74d0c':
  restore coverage lost in NotoColorEmoji transition
parents cc94a76a 7ca74d0c

data/fonts/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ font_src_files += \ 
    DroidSansHebrew-Regular.ttf \

    DroidSansHebrew-Bold.ttf \

    DroidSansArmenian.ttf \

    DroidSansGeorgian.ttf

    DroidSansGeorgian.ttf \

    AndroidEmoji.ttf



endif # !MINIMAL_FONT

data/fonts/AndroidEmoji.ttf

0 → 100644
+2.68 KiB

File added.

No diff preview for this file type.

View file

data/fonts/fallback_fonts.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

data/fonts/fonts.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \ 
    DroidSansMono.ttf \

    DroidSansArmenian.ttf \

    DroidSansGeorgian.ttf \

    AndroidEmoji.ttf \

    Clockopia.ttf \

    AndroidClock.ttf \

    AndroidClock_Highlight.ttf \