diff options
| author | Victoria Lease <violets@android.com> | 2014-03-04 00:04:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 00:04:22 +0000 |
| commit | 4fa72e3574a4f3ee84af4728633e70b65a4b241f (patch) | |
| tree | fa77b417ed06bcd2b4b10fee13ca3baec074061d /data | |
| parent | a4eeb0dca0108ac5b2c0f0dc044c9104ba1db302 (diff) | |
| parent | 533d300f9a4ac98661affe1deb9dca72306ada2b (diff) | |
| download | frameworks_base-4fa72e3574a4f3ee84af4728633e70b65a4b241f.zip frameworks_base-4fa72e3574a4f3ee84af4728633e70b65a4b241f.tar.gz frameworks_base-4fa72e3574a4f3ee84af4728633e70b65a4b241f.tar.bz2 | |
am 533d300f: am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."
* commit '533d300f9a4ac98661affe1deb9dca72306ada2b':
Add casual/cursive/sans-serif-smallcaps font families.
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/system_fonts.xml | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 16e4c7c..549f061b 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -75,7 +75,6 @@ <name>baskerville</name> <name>goudy</name> <name>fantasy</name> - <name>cursive</name> <name>ITC Stone Serif</name> </nameset> <fileset> @@ -108,4 +107,32 @@ </fileset> </family> + <family> + <nameset> + <name>casual</name> + </nameset> + <fileset> + <file>ComingSoon.ttf</file> + </fileset> + </family> + + <family> + <nameset> + <name>cursive</name> + </nameset> + <fileset> + <file>DancingScript-Regular.ttf</file> + <file>DancingScript-Bold.ttf</file> + </fileset> + </family> + + <family> + <nameset> + <name>sans-serif-smallcaps</name> + </nameset> + <fileset> + <file>CarroisGothicSC-Regular.ttf</file> + </fileset> + </family> + </familyset> |