diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-11 00:24:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-11 00:24:03 +0000 |
| commit | 3bb0b2964df28a17999a53a4b3c7667f81a58506 (patch) | |
| tree | 3bda98106691cfa549e263fdbc6313b9f9cbe71e | |
| parent | a516e445651724da3a833d08540c42fabe4f34b7 (diff) | |
| parent | 99cc35bbde7415fcdeada6fb4243097af85ae33f (diff) | |
| download | frameworks_base-3bb0b2964df28a17999a53a4b3c7667f81a58506.zip frameworks_base-3bb0b2964df28a17999a53a4b3c7667f81a58506.tar.gz frameworks_base-3bb0b2964df28a17999a53a4b3c7667f81a58506.tar.bz2 | |
am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev
* commit '99cc35bbde7415fcdeada6fb4243097af85ae33f':
Add Cutive Mono as serif monospace font for captioning
| -rw-r--r-- | data/fonts/fonts.xml | 9 | ||||
| -rw-r--r-- | data/fonts/system_fonts.xml | 14 |
2 files changed, 19 insertions, 4 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 04bc67a..09055c6 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -70,10 +70,15 @@ <family name="monospace"> <font weight="400" style="normal">DroidSansMono.ttf</font> </family> - <alias name="courier" to="monospace" /> - <alias name="courier new" to="monospace" /> + <alias name="sans-serif-monospace" to="monospace" /> <alias name="monaco" to="monospace" /> + <family name="serif-monospace"> + <font weight="400" style="normal">CutiveMono.ttf</font> + </family> + <alias name="courier" to="serif-monospace" /> + <alias name="courier new" to="serif-monospace" /> + <family name="casual"> <font weight="400" style="normal">ComingSoon.ttf</font> </family> diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 8c59fea..2a48faa 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -129,8 +129,7 @@ <family> <nameset> <name>monospace</name> - <name>courier</name> - <name>courier new</name> + <name>sans-serif-monospace</name> <name>monaco</name> </nameset> <fileset> @@ -140,6 +139,17 @@ <family> <nameset> + <name>serif-monospace</name> + <name>courier</name> + <name>courier new</name> + </nameset> + <fileset> + <file>CutiveMono.ttf</file> + </fileset> + </family> + + <family> + <nameset> <name>casual</name> </nameset> <fileset> |