Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: resources/android_fonts/v22/fonts.xml

Issue 1128913008: Revert of Font variations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/ports/SkFontMgr.h ('k') | src/core/SkAdvancedTypefaceMetrics.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <familyset version="21"> 2 <familyset version="21">
3 <!-- first font is default --> 3 <!-- first font is default -->
4 <family name="sans-serif"> 4 <family name="sans-serif">
5 <font weight="100" style="normal"> 5 <font weight="100" style="normal">
6 Roboto-Thin.ttf 6 Roboto-Thin.ttf
7 </font> 7 </font>
8 <font weight="100" style="italic">Roboto-ThinItalic.ttf</font> 8 <font weight="100" style="italic">Roboto-ThinItalic.ttf</font>
9 <font weight="300" style="normal">Roboto-Light.ttf</font> 9 <font weight="300" style="normal">Roboto-Light.ttf</font>
10 <font weight="300" style="italic">Roboto-LightItalic.ttf</font> 10 <font weight="300" style="italic">Roboto-LightItalic.ttf</font>
11 <font weight="400" style="normal">Roboto-Regular.ttf</font> 11 <font weight="400" style="normal">Roboto-Regular.ttf</font>
12 <font weight="400" style="italic">Roboto-Italic.ttf</font> 12 <font weight="400" style="italic">Roboto-Italic.ttf</font>
13 <font weight="500" style="normal">Roboto-Medium.ttf</font> 13 <font weight="500" style="normal">Roboto-Medium.ttf</font>
14 <font weight="500" style="italic">Roboto-MediumItalic.ttf</font> 14 <font weight="500" style="italic">Roboto-MediumItalic.ttf</font>
15 <font weight="700" style="normal">Roboto-Bold.ttf</font> 15 <font weight="700" style="normal">Roboto-Bold.ttf</font>
16 <font weight="700" style="italic">Roboto-BoldItalic.ttf</font> 16 <font weight="700" style="italic">Roboto-BoldItalic.ttf</font>
17 <font weight="900" style="normal">Roboto-Black.ttf</font> 17 <font weight="900" style="normal">Roboto-Black.ttf</font>
18 <font weight="900" style="italic">Roboto-BlackItalic.ttf</font> 18 <font weight="900" style="italic">Roboto-BlackItalic.ttf</font>
19 </family> 19 </family>
20 <alias name="sans-serif-thin" to="sans-serif" weight="100" /> 20 <alias name="sans-serif-thin" to="sans-serif" weight="100" />
21 <alias name="sans-serif-light" to="sans-serif" weight="300" /> 21 <alias name="sans-serif-light" to="sans-serif" weight="300" />
22 <alias name="sans-serif-black" to="sans-serif" weight="900" /> 22 <alias name="sans-serif-black" to="sans-serif" weight="900" />
23 <alias name="arial" to="sans-serif" /> 23 <alias name="arial" to="sans-serif" />
24 <alias name="helvetica" to="sans-serif" /> 24 <alias name="helvetica" to="sans-serif" />
25 <alias name="tahoma" to="sans-serif" /> 25 <alias name="tahoma" to="sans-serif" />
26 <alias name="verdana" to="sans-serif" /> 26 <alias name="verdana" to="sans-serif" />
27 27
28 <family name="var">
29 <font weight="100" style="normal"><axis tag="wght" stylevalue="0.5"/>Dis tortable.ttf</font>
30 <font weight="200" style="normal"><axis tag="wght" stylevalue="0.65"/>Di stortable.ttf</font>
31 <font weight="300" style="normal"><axis tag="wght" stylevalue="0.85"/>Di stortable.ttf</font>
32 <font weight="400" style="normal"><axis tag="wght" stylevalue="1.0"/>Dis tortable.ttf</font>
33 <font weight="500" style="normal"><axis tag="wght" stylevalue="1.2"/>Dis tortable.ttf</font>
34 <font weight="600" style="normal"><axis tag="wght" stylevalue="1.4"/>Dis tortable.ttf</font>
35 <font weight="700" style="normal"><axis tag="wght" stylevalue="1.6"/>Dis tortable.ttf</font>
36 <font weight="800" style="normal"><axis tag="wght" stylevalue="1.8"/>Dis tortable.ttf</font>
37 <font weight="900" style="normal"><axis tag="wght" stylevalue="2.0"/>Dis tortable.ttf</font>
38 </family>
39
40 <family name="sans-serif-condensed"> 28 <family name="sans-serif-condensed">
41 <font weight="300" style="normal">RobotoCondensed-Light.ttf</font> 29 <font weight="300" style="normal">RobotoCondensed-Light.ttf</font>
42 <font weight="300" style="italic">RobotoCondensed-LightItalic.ttf</font> 30 <font weight="300" style="italic">RobotoCondensed-LightItalic.ttf</font>
43 <font weight="400" style="normal">RobotoCondensed-Regular.ttf</font> 31 <font weight="400" style="normal">RobotoCondensed-Regular.ttf</font>
44 <font weight="400" style="italic">RobotoCondensed-Italic.ttf</font> 32 <font weight="400" style="italic">RobotoCondensed-Italic.ttf</font>
45 <font weight="700" style="normal">RobotoCondensed-Bold.ttf</font> 33 <font weight="700" style="normal">RobotoCondensed-Bold.ttf</font>
46 <font weight="700" style="italic">RobotoCondensed-BoldItalic.ttf</font> 34 <font weight="700" style="italic">RobotoCondensed-BoldItalic.ttf</font>
47 </family> 35 </family>
48 <alias name="sans-serif-condensed-light" to="sans-serif-condensed" weight="3 00" /> 36 <alias name="sans-serif-condensed-light" to="sans-serif-condensed" weight="3 00" />
49 37
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 <family> 225 <family>
238 <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf< /font> 226 <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf< /font>
239 </family> 227 </family>
240 <family> 228 <family>
241 <font weight="400" style="normal">NotoColorEmoji.ttf</font> 229 <font weight="400" style="normal">NotoColorEmoji.ttf</font>
242 </family> 230 </family>
243 <family lang="ja"> 231 <family lang="ja">
244 <font weight="400" style="normal">MTLmr3m.ttf</font> 232 <font weight="400" style="normal">MTLmr3m.ttf</font>
245 </family> 233 </family>
246 </familyset> 234 </familyset>
OLDNEW
« no previous file with comments | « include/ports/SkFontMgr.h ('k') | src/core/SkAdvancedTypefaceMetrics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698