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

Commit 7a9217d2 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android Git Automerger
Browse files

am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 

* commit '73d2f160':
  Move NotoSansSymbols higher than CJK in the fallback chain.
parents f6331ad2 73d2f160

data/fonts/fallback_fonts.xml

+5 −5
Original line number Diff line number Diff line
@@ -405,6 +405,11 @@ 
            <file>NotoSansYi-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="zh-Hans">NotoSansSC-Regular.otf</file>
@@ -430,11 +435,6 @@ 
            <file>NanumGothic.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoColorEmoji.ttf</file>

data/fonts/fonts.xml

+3 −3
Original line number Diff line number Diff line
@@ -331,6 +331,9 @@ 
    <family>

        <font weight="400" style="normal">NotoSansYi-Regular.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>

    </family>

    <family lang="zh-Hans">

        <font weight="400" style="normal">NotoSansSC-Regular.otf</font>

    </family>
@@ -346,9 +349,6 @@ 
    <family>

        <font weight="400" style="normal">NanumGothic.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoColorEmoji.ttf</font>

    </family>