Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update fonts.xml with user customization fonts."

Browse Source 
This reverts commit 1c3e743134.

Reason for revert: likely cause for broken build 5211430 and later

Change-Id: I2ef3a24c16d09b7c7d1c8c4f8a4e5570237a5bf1
This commit is contained in:
Tor Norbye
2019-01-05 20:47:13 +00:00
parent 1c3e743134
commit 2066ded373
3 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
data/fonts/fonts.xml
View File

@@ -99,46 +99,6 @@
<font weight="400" style="normal">CarroisGothicSC-Regular.ttf</font>
</family>
<family name="arbutus-slab">
<font weight="400" style="normal">ArbutusSlab-Regular.ttf</font>
</family>
<family name="arvo">
<font weight="400" style="normal">Arvo-Regular.ttf</font>
<font weight="400" style="italic">Arvo-Italic.ttf</font>
<font weight="700" style="normal">Arvo-Bold.ttf</font>
<font weight="700" style="italic">Arvo-BoldItalic.ttf</font>
</family>
<alias name="arvo-bold" to="arvo" weight="700" />
<family name="lato">
<font weight="400" style="normal">Lato-Regular.ttf</font>
<font weight="400" style="italic">Lato-Italic.ttf</font>
<font weight="700" style="normal">Lato-Bold.ttf</font>
<font weight="700" style="italic">Lato-BoldItalic.ttf</font>
</family>
<alias name="lato-bold" to="lato" weight="700" />
<family name="rubik">
<font weight="400" style="normal">Rubik-Regular.ttf</font>
<font weight="400" style="italic">Rubik-Italic.ttf</font>
<font weight="500" style="normal">Rubik-Medium.ttf</font>
<font weight="500" style="italic">Rubik-MediumItalic.ttf</font>
<font weight="700" style="normal">Rubik-Bold.ttf</font>
<font weight="700" style="italic">Rubik-BoldItalic.ttf</font>
</family>
<alias name="rubik-medium" to="rubik" weight="500" />
<family name="source-sans-pro">
<font weight="400" style="normal">SourceSansPro-Regular.ttf</font>
<font weight="400" style="italic">SourceSansPro-Italic.ttf</font>
<font weight="600" style="normal">SourceSansPro-SemiBold.ttf</font>
<font weight="600" style="italic">SourceSansPro-SemiBoldItalic.ttf</font>
<font weight="700" style="normal">SourceSansPro-Bold.ttf</font>
<font weight="700" style="italic">SourceSansPro-BoldItalic.ttf</font>
</family>
<alias name="source-sans-pro-semi-bold" to="source-sans-pro" weight="600" />
<!-- fallback fonts -->
<family lang="und-Arab" variant="elegant">
<font weight="400" style="normal">NotoNaskhArabic-Regular.ttf</font>

2
packages/overlays/FontArbutusSourceOverlay/res/values/config.xml
View File

@@ -19,7 +19,7 @@
<!-- Name of a font family to use for body text. -->
<string name="config_bodyFontFamily" translatable="false">source-sans-pro</string>
<!-- Name of a font family to use for medium body text. -->
<string name="config_bodyFontFamilyMedium" translatable="false">source-sans-pro-semi-bold</string>
<string name="config_bodyFontFamilyMedium" translatable="false">source-sans-pro-medium</string>
<!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
<string name="config_headlineFontFamily" translatable="false">arbutus-slab</string>
<!-- Name of the font family used for system surfaces where the font should use medium weight -->

4
packages/overlays/FontArvoLatoOverlay/res/values/config.xml
View File

@@ -19,10 +19,10 @@
<!-- Name of a font family to use for body text. -->
<string name="config_bodyFontFamily" translatable="false">lato</string>
<!-- Name of a font family to use for medium body text. -->
<string name="config_bodyFontFamilyMedium" translatable="false">lato-bold</string>
<string name="config_bodyFontFamilyMedium" translatable="false">lato-medium</string>
<!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
<string name="config_headlineFontFamily" translatable="false">arvo</string>
<!-- Name of the font family used for system surfaces where the font should use medium weight -->
<string name="config_headlineFontFamilyMedium" translatable="false">arvo-bold</string>
<string name="config_headlineFontFamilyMedium" translatable="false">arvo-medium</string>
</resources>