Merge "Add RobotoFlex into AOSP system image" am: e75c620165 am: 9b0f9548c9 am: 95aa83ebee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2606947 Change-Id: Ied801a4b67a9be43fdfbd3ebbd7aa0697b5e3cdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user