summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-10 12:52:25 -0700
committerAlan Viverette <alanv@google.com>2014-10-10 12:52:25 -0700
commit4f9140b52c7bed3ec973eaad9b7f090805763c22 (patch)
tree69b9450969210558aff1d293ab2f2a0bf8f662cc
parentc43caf52a61e56d5ed78f947fc8c299ad5273abf (diff)
downloadframeworks_base-4f9140b52c7bed3ec973eaad9b7f090805763c22.zip
frameworks_base-4f9140b52c7bed3ec973eaad9b7f090805763c22.tar.gz
frameworks_base-4f9140b52c7bed3ec973eaad9b7f090805763c22.tar.bz2
Add Cutive Mono as serif monospace font for captioning
Sets up Courier and Courier New to point to Cutive Mono, since Courier is a serif monospace font. BUG: 17666124 Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
-rw-r--r--data/fonts/fonts.xml9
-rw-r--r--data/fonts/system_fonts.xml14
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>