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

Commit f6a1d4ba authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Brian Egizi
Browse files

Add RobotoFlex into AOSP system image 

Cherry picked I8324c16fa8c392163e81fb9f4c21bba3343b6df0 to master due to b/286408867.

Code was merged via `-s ours` and is missing even though the sha exists on the target branch. Cherry pick is required to bring in the code.

Manually remove the "Merged in" directive to allow for downstream propagation.

(cherry picked from https://android-review.googlesource.com/q/commit:2872d3fa5b6923dbcfea99c4e5e7fd6bb3526f5f)

Bug: 235303866
Test: Manually done
Change-Id: I587161bd6fca5ac02a127a675ceab4f9203d2652
parent 0d5b81ba

data/fonts/fonts.xml

+93 −0
Original line number Diff line number Diff line
@@ -277,6 +277,99 @@ 
    </family>

    <alias name="source-sans-pro-semi-bold" to="source-sans-pro" weight="600"/>



    <family name="roboto-flex">

        <font weight="100" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="100" />

        </font>

        <font weight="200" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="200" />

        </font>

        <font weight="300" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="300" />

        </font>

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

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="400" />

        </font>

        <font weight="500" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="500" />

        </font>

        <font weight="600" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="600" />

        </font>

        <font weight="700" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="700" />

        </font>

        <font weight="800" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="800" />

        </font>

        <font weight="900" style="normal">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="0" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="900" />

        </font>

        <font weight="100" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="100" />

        </font>

        <font weight="200" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="200" />

        </font>

        <font weight="300" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="300" />

        </font>

        <font weight="400" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="400" />

        </font>

        <font weight="500" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="500" />

        </font>

        <font weight="600" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="600" />

        </font>

        <font weight="700" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="700" />

        </font>

        <font weight="800" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="800" />

        </font>

        <font weight="900" style="italic">RobotoFlex-Regular.ttf

          <axis tag="slnt" stylevalue="-10" />

          <axis tag="wdth" stylevalue="100" />

          <axis tag="wght" stylevalue="900" />

        </font>

    </family>



    <!-- fallback fonts -->

    <family lang="und-Arab" variant="elegant">

        <font weight="400" style="normal" postScriptName="NotoNaskhArabic">