diff options
| author | Victoria Lease <violets@android.com> | 2014-03-11 18:28:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:28:41 +0000 |
| commit | 544d696576e0799f5d9581d0843f185b9691dcfd (patch) | |
| tree | 9f389dd39b14b1f402c3dec89008383382e85afb /data | |
| parent | e1b6ab427c3a0a149022103dc081d46935a31ffa (diff) | |
| parent | 3ce2b57d15d4afe330b728c3175b8bfb89c6890a (diff) | |
| download | frameworks_base-544d696576e0799f5d9581d0843f185b9691dcfd.zip frameworks_base-544d696576e0799f5d9581d0843f185b9691dcfd.tar.gz frameworks_base-544d696576e0799f5d9581d0843f185b9691dcfd.tar.bz2 | |
am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."
* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
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> |