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

Commit 22e2c225 authored by Victoria Lease's avatar Victoria Lease Committed by Android (Google) Code Review
Browse files

Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev

parents 62f3bdec 54769862

data/fonts/Android.mk

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

    DroidSansHebrew-Bold.ttf \

    DroidSansArmenian.ttf \

    DroidSansGeorgian.ttf \

    AndroidEmoji.ttf

    DroidSansGeorgian.ttf



endif # !MINIMAL_FONT

data/fonts/AndroidEmoji.ttf

deleted100644 → 0
−3.34 MiB

File deleted.

View file

data/fonts/fallback_fonts.xml

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
    </family>

    <family>

        <fileset>

            <file>AndroidEmoji.ttf</file>

            <file>NotoColorEmoji.ttf</file>

        </fileset>

    </family>

    <family>

data/fonts/fonts.mk

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

    DroidSansArmenian.ttf \

    DroidSansGeorgian.ttf \

    AndroidEmoji.ttf \

    Clockopia.ttf \

    AndroidClock.ttf \

    AndroidClock_Highlight.ttf \