diff options
| author | Raph Levien <raph@google.com> | 2012-05-09 11:47:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 11:47:08 -0700 |
| commit | 3fe37eb3e91ff338ff7a7b99e64835f3a9c5db0e (patch) | |
| tree | e4843ad8c8ca17d38810e894e289d069eff9f6c9 | |
| parent | 88f295d72b6228738a9ea7eaa0a3b8796a1ff918 (diff) | |
| parent | ca81b7ddebe7654c0f4666e1ba5440c0ec81b3d6 (diff) | |
| download | frameworks_base-3fe37eb3e91ff338ff7a7b99e64835f3a9c5db0e.zip frameworks_base-3fe37eb3e91ff338ff7a7b99e64835f3a9c5db0e.tar.gz frameworks_base-3fe37eb3e91ff338ff7a7b99e64835f3a9c5db0e.tar.bz2 | |
am ca81b7dd: Merge "Add Roboto Light and Light italic fonts, as sans-serif-light family" into jb-dev
* commit 'ca81b7ddebe7654c0f4666e1ba5440c0ec81b3d6':
Add Roboto Light and Light italic fonts, as sans-serif-light family
| -rw-r--r-- | data/fonts/Android.mk | 2 | ||||
| -rw-r--r-- | data/fonts/Roboto-Light.ttf | bin | 0 -> 173776 bytes | |||
| -rw-r--r-- | data/fonts/Roboto-LightItalic.ttf | bin | 0 -> 177000 bytes | |||
| -rw-r--r-- | data/fonts/fonts.mk | 2 | ||||
| -rw-r--r-- | data/fonts/system_fonts.xml | 10 |
5 files changed, 14 insertions, 0 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 13f2480..16a98d3 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -142,6 +142,8 @@ font_src_files := \ Roboto-Bold.ttf \ Roboto-Italic.ttf \ Roboto-BoldItalic.ttf \ + Roboto-Light.ttf \ + Roboto-LightItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskh-Regular-SystemUI.ttf \ DroidSansDevanagari-Regular.ttf \ diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf Binary files differnew file mode 100644 index 0000000..b50399e --- /dev/null +++ b/data/fonts/Roboto-Light.ttf diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..a1fdc8d --- /dev/null +++ b/data/fonts/Roboto-LightItalic.ttf diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 7a84df6..397ccda 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -24,6 +24,8 @@ PRODUCT_PACKAGES := \ Roboto-Bold.ttf \ Roboto-Italic.ttf \ Roboto-BoldItalic.ttf \ + Roboto-Light.ttf \ + Roboto-LightItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskh-Regular-SystemUI.ttf \ DroidSansDevanagari-Regular.ttf \ diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index d2fe546..95c4f70 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -36,6 +36,16 @@ <family> <nameset> + <name>sans-serif-light</name> + </nameset> + <fileset> + <file>Roboto-Light.ttf</file> + <file>Roboto-LightItalic.ttf</file> + </fileset> + </family> + + <family> + <nameset> <name>serif</name> <name>times</name> <name>times new roman</name> |