diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 452c5758cf512..c6bccfefdceb2 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 new file mode 100644 index 0000000000000..18cf2ae107c91 Binary files /dev/null and b/data/fonts/Roboto-Black.ttf differ diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf index c5b9c676ce6b3..7e43dd2cd793e 100644 Binary files a/data/fonts/Roboto-Bold.ttf and b/data/fonts/Roboto-Bold.ttf differ diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf index 032021453de43..b8f316562b93c 100644 Binary files a/data/fonts/Roboto-BoldItalic.ttf and b/data/fonts/Roboto-BoldItalic.ttf differ diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf index 38ba5705ea1ec..b84e93cdd28e2 100644 Binary files a/data/fonts/Roboto-Italic.ttf and b/data/fonts/Roboto-Italic.ttf differ diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf index 271606b013607..46c6fbcedb787 100644 Binary files a/data/fonts/Roboto-Light.ttf and b/data/fonts/Roboto-Light.ttf differ diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf index 17ef355a8de42..e11331d1c9311 100644 Binary files a/data/fonts/Roboto-LightItalic.ttf and b/data/fonts/Roboto-LightItalic.ttf differ diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf new file mode 100644 index 0000000000000..433bca4290612 Binary files /dev/null and b/data/fonts/Roboto-Medium.ttf differ diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 0000000000000..7166eb76c7025 Binary files /dev/null and b/data/fonts/Roboto-MediumItalic.ttf differ diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf index 746906381b018..7180d51fc1bf5 100644 Binary files a/data/fonts/Roboto-Regular.ttf and b/data/fonts/Roboto-Regular.ttf differ diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf index 74efe4df214d8..9792ed1147b3d 100644 Binary files a/data/fonts/Roboto-Thin.ttf and b/data/fonts/Roboto-Thin.ttf differ diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf index f08ea5153b20d..5366fe5f3163d 100644 Binary files a/data/fonts/Roboto-ThinItalic.ttf and b/data/fonts/Roboto-ThinItalic.ttf differ diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf index 1252d00e51650..fe52e7d4e0c45 100644 Binary files a/data/fonts/RobotoCondensed-Bold.ttf and b/data/fonts/RobotoCondensed-Bold.ttf differ diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf index e914a07019f13..2d29ffbc2f06e 100644 Binary files a/data/fonts/RobotoCondensed-BoldItalic.ttf and b/data/fonts/RobotoCondensed-BoldItalic.ttf differ diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf index 8a570cf899581..1d7eb089a44bd 100644 Binary files a/data/fonts/RobotoCondensed-Italic.ttf and b/data/fonts/RobotoCondensed-Italic.ttf differ diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf index 41d212a576565..1209024e943e3 100644 Binary files a/data/fonts/RobotoCondensed-Light.ttf and b/data/fonts/RobotoCondensed-Light.ttf differ diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf old mode 100755 new mode 100644 index dd54971d04b4a..ed1cceae9dcfe Binary files a/data/fonts/RobotoCondensed-LightItalic.ttf and b/data/fonts/RobotoCondensed-LightItalic.ttf differ diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf index a16b9cb90970d..4a9a6f974e77a 100644 Binary files a/data/fonts/RobotoCondensed-Regular.ttf and b/data/fonts/RobotoCondensed-Regular.ttf differ diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 2312a04a5343a..e5573bb2161c8 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 97b7fd85078bc..646b33b582809 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -66,6 +66,25 @@ + + + sans-serif-medium + + + Roboto-Medium.ttf + Roboto-MediumItalic.ttf + + + + + + sans-serif-black + + + Roboto-Black.ttf + + + sans-serif-condensed-light