diff options
author | Victoria Lease <violets@google.com> | 2014-05-20 07:53:26 -0700 |
---|---|---|
committer | Victoria Lease <violets@google.com> | 2014-05-23 11:25:47 -0700 |
commit | 42460150cbd9222e38e0099218f773e15b9c0f79 (patch) | |
tree | 071205f5bee0ad1d8b16eb8a8667e2080f62e17e /data | |
parent | b72b09cb5eebacc2d6915fd3fa01f113a6e86074 (diff) | |
download | frameworks_base-42460150cbd9222e38e0099218f773e15b9c0f79.zip frameworks_base-42460150cbd9222e38e0099218f773e15b9c0f79.tar.gz frameworks_base-42460150cbd9222e38e0099218f773e15b9c0f79.tar.bz2 |
Roboto v2
Fresh new revisions of our Roboto family of fonts, including family
aliases for sans-serif-medium and sans-serif-black. Enjoy!
Change-Id: I2337ccbd1767a7769deea885e0900f1ca4329779
Bug: 15170360
Diffstat (limited to 'data')
-rw-r--r-- | data/fonts/Android.mk | 6 | ||||
-rw-r--r-- | data/fonts/Roboto-Black.ttf | bin | 0 -> 127948 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Bold.ttf | bin | 117240 -> 127744 bytes | |||
-rw-r--r-- | data/fonts/Roboto-BoldItalic.ttf | bin | 120668 -> 134556 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Italic.ttf | bin | 101180 -> 132440 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Light.ttf | bin | 115200 -> 126792 bytes | |||
-rw-r--r-- | data/fonts/Roboto-LightItalic.ttf | bin | 118728 -> 133172 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Medium.ttf | bin | 0 -> 127488 bytes | |||
-rw-r--r-- | data/fonts/Roboto-MediumItalic.ttf | bin | 0 -> 134312 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Regular.ttf | bin | 114976 -> 126072 bytes | |||
-rw-r--r-- | data/fonts/Roboto-Thin.ttf | bin | 115632 -> 127584 bytes | |||
-rw-r--r-- | data/fonts/Roboto-ThinItalic.ttf | bin | 119376 -> 132860 bytes | |||
-rw-r--r-- | data/fonts/RobotoCondensed-Bold.ttf | bin | 115036 -> 127340 bytes | |||
-rw-r--r-- | data/fonts/RobotoCondensed-BoldItalic.ttf | bin | 118580 -> 135504 bytes | |||
-rw-r--r-- | data/fonts/RobotoCondensed-Italic.ttf | bin | 118064 -> 133908 bytes | |||
-rw-r--r-- | data/fonts/RobotoCondensed-Light.ttf | bin | 160800 -> 126168 bytes | |||
-rw-r--r--[-rwxr-xr-x] | data/fonts/RobotoCondensed-LightItalic.ttf | bin | 164432 -> 134544 bytes | |||
-rw-r--r-- | data/fonts/RobotoCondensed-Regular.ttf | bin | 114568 -> 125332 bytes | |||
-rw-r--r-- | data/fonts/fonts.mk | 3 | ||||
-rw-r--r-- | data/fonts/system_fonts.xml | 19 |
20 files changed, 28 insertions, 0 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 452c575..c6bccfe 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -105,8 +105,11 @@ font_src_files := \ ifeq ($(MINIMAL_FONT_FOOTPRINT),true) +$(eval $(call create-font-symlink,Roboto-Black.ttf,Roboto-Bold.ttf)) $(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf)) $(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf)) +$(eval $(call create-font-symlink,Roboto-Medium.ttf,Roboto-Regular.ttf)) +$(eval $(call create-font-symlink,Roboto-MediumItalic.ttf,Roboto-Italic.ttf)) $(eval $(call create-font-symlink,Roboto-Thin.ttf,Roboto-Regular.ttf)) $(eval $(call create-font-symlink,Roboto-ThinItalic.ttf,Roboto-Italic.ttf)) $(eval $(call create-font-symlink,RobotoCondensed-Regular.ttf,Roboto-Regular.ttf)) @@ -116,8 +119,11 @@ $(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItal else # !MINIMAL_FONT font_src_files += \ + Roboto-Black.ttf \ Roboto-Light.ttf \ Roboto-LightItalic.ttf \ + Roboto-Medium.ttf \ + Roboto-MediumItalic.ttf \ Roboto-Thin.ttf \ Roboto-ThinItalic.ttf \ RobotoCondensed-Regular.ttf \ diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf Binary files differnew file mode 100644 index 0000000..2cdbe43 --- /dev/null +++ b/data/fonts/Roboto-Black.ttf diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf Binary files differindex c5b9c67..15c9b4e 100644 --- a/data/fonts/Roboto-Bold.ttf +++ b/data/fonts/Roboto-Bold.ttf diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf Binary files differindex 0320214..a0abf30 100644 --- a/data/fonts/Roboto-BoldItalic.ttf +++ b/data/fonts/Roboto-BoldItalic.ttf diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf Binary files differindex 38ba570..67b5394 100644 --- a/data/fonts/Roboto-Italic.ttf +++ b/data/fonts/Roboto-Italic.ttf diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf Binary files differindex 271606b..d9fb64a 100644 --- a/data/fonts/Roboto-Light.ttf +++ b/data/fonts/Roboto-Light.ttf diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf Binary files differindex 17ef355..1fd1d31 100644 --- a/data/fonts/Roboto-LightItalic.ttf +++ b/data/fonts/Roboto-LightItalic.ttf diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf Binary files differnew file mode 100644 index 0000000..c63c115 --- /dev/null +++ b/data/fonts/Roboto-Medium.ttf diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf Binary files differnew file mode 100644 index 0000000..cd7c835 --- /dev/null +++ b/data/fonts/Roboto-MediumItalic.ttf diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf Binary files differindex 7469063..9cb4a5a 100644 --- a/data/fonts/Roboto-Regular.ttf +++ b/data/fonts/Roboto-Regular.ttf diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf Binary files differindex 74efe4d..f02f100 100644 --- a/data/fonts/Roboto-Thin.ttf +++ b/data/fonts/Roboto-Thin.ttf diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf Binary files differindex f08ea51..12a2ce0 100644 --- a/data/fonts/Roboto-ThinItalic.ttf +++ b/data/fonts/Roboto-ThinItalic.ttf diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf Binary files differindex 1252d00..1079af6 100644 --- a/data/fonts/RobotoCondensed-Bold.ttf +++ b/data/fonts/RobotoCondensed-Bold.ttf diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf Binary files differindex e914a07..e7f13c2 100644 --- a/data/fonts/RobotoCondensed-BoldItalic.ttf +++ b/data/fonts/RobotoCondensed-BoldItalic.ttf diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf Binary files differindex 8a570cf..7fa0448 100644 --- a/data/fonts/RobotoCondensed-Italic.ttf +++ b/data/fonts/RobotoCondensed-Italic.ttf diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf Binary files differindex 41d212a..96b75dd 100644 --- a/data/fonts/RobotoCondensed-Light.ttf +++ b/data/fonts/RobotoCondensed-Light.ttf diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf Binary files differindex dd54971..7a2c164 100755..100644 --- a/data/fonts/RobotoCondensed-LightItalic.ttf +++ b/data/fonts/RobotoCondensed-LightItalic.ttf diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf Binary files differindex a16b9cb..734cc40 100644 --- a/data/fonts/RobotoCondensed-Regular.ttf +++ b/data/fonts/RobotoCondensed-Regular.ttf diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 2312a04..e5573bb 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -24,8 +24,11 @@ PRODUCT_PACKAGES := \ Roboto-Bold.ttf \ Roboto-Italic.ttf \ Roboto-BoldItalic.ttf \ + Roboto-Black.ttf \ Roboto-Light.ttf \ Roboto-LightItalic.ttf \ + Roboto-Medium.ttf \ + Roboto-MediumItalic.ttf \ Roboto-Thin.ttf \ Roboto-ThinItalic.ttf \ RobotoCondensed-Regular.ttf \ diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 97b7fd8..646b33b 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -68,6 +68,25 @@ <family> <nameset> + <name>sans-serif-medium</name> + </nameset> + <fileset> + <file>Roboto-Medium.ttf</file> + <file>Roboto-MediumItalic.ttf</file> + </fileset> + </family> + + <family> + <nameset> + <name>sans-serif-black</name> + </nameset> + <fileset> + <file>Roboto-Black.ttf</file> + </fileset> + </family> + + <family> + <nameset> <name>sans-serif-condensed-light</name> </nameset> <fileset> |