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

Commit fe1dd94b authored by Bart Sears's avatar Bart Sears Committed by Android (Google) Code Review
Browse files

Merge "Emoji characters for Android"

parents 4ebe916f e60bae1d

data/fonts/AndroidEmoji.ttf

0 → 100644
+320 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
@@ -69,6 +69,11 @@ 
            <file>Lohit-Tamil.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>AndroidEmoji.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansFallback.ttf</file>

data/fonts/fonts.mk

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ PRODUCT_COPY_FILES := \ 
    frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \

    frameworks/base/data/fonts/DroidSansArmenian.ttf:system/fonts/DroidSansArmenian.ttf \

    frameworks/base/data/fonts/DroidSansGeorgian.ttf:system/fonts/DroidSansGeorgian.ttf \

    frameworks/base/data/fonts/AndroidEmoji.ttf:system/fonts/AndroidEmoji.ttf \

    frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \

    frameworks/base/data/fonts/AndroidClock.ttf:system/fonts/AndroidClock.ttf \

    frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf \