diff options
| -rwxr-xr-x | data/fonts/Roboto-Bold.ttf | bin | 0 -> 80588 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-BoldCondensed.ttf | bin | 0 -> 80508 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-BoldCondensedItalic.ttf | bin | 0 -> 83364 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-BoldItalic.ttf | bin | 0 -> 83452 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-Condensed.ttf | bin | 0 -> 80000 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-CondensedItalic.ttf | bin | 0 -> 82968 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-Italic.ttf | bin | 0 -> 83096 bytes | |||
| -rwxr-xr-x | data/fonts/Roboto-Regular.ttf | bin | 0 -> 80328 bytes | |||
| -rw-r--r-- | data/fonts/fonts.mk | 4 | ||||
| -rw-r--r-- | data/fonts/system_fonts.xml | 16 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/Font.java | 8 | ||||
| -rw-r--r-- | libs/rs/rsFont.cpp | 2 |
12 files changed, 23 insertions, 7 deletions
diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf Binary files differnew file mode 100755 index 000000000000..32c1794438d7 --- /dev/null +++ b/data/fonts/Roboto-Bold.ttf diff --git a/data/fonts/Roboto-BoldCondensed.ttf b/data/fonts/Roboto-BoldCondensed.ttf Binary files differnew file mode 100755 index 000000000000..61da020fed0e --- /dev/null +++ b/data/fonts/Roboto-BoldCondensed.ttf diff --git a/data/fonts/Roboto-BoldCondensedItalic.ttf b/data/fonts/Roboto-BoldCondensedItalic.ttf Binary files differnew file mode 100755 index 000000000000..b946dce6324e --- /dev/null +++ b/data/fonts/Roboto-BoldCondensedItalic.ttf diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf Binary files differnew file mode 100755 index 000000000000..551bae22cc73 --- /dev/null +++ b/data/fonts/Roboto-BoldItalic.ttf diff --git a/data/fonts/Roboto-Condensed.ttf b/data/fonts/Roboto-Condensed.ttf Binary files differnew file mode 100755 index 000000000000..73a868f8920b --- /dev/null +++ b/data/fonts/Roboto-Condensed.ttf diff --git a/data/fonts/Roboto-CondensedItalic.ttf b/data/fonts/Roboto-CondensedItalic.ttf Binary files differnew file mode 100755 index 000000000000..a0969bb1b733 --- /dev/null +++ b/data/fonts/Roboto-CondensedItalic.ttf diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf Binary files differnew file mode 100755 index 000000000000..9795cc0a1004 --- /dev/null +++ b/data/fonts/Roboto-Italic.ttf diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf Binary files differnew file mode 100755 index 000000000000..8545f2912642 --- /dev/null +++ b/data/fonts/Roboto-Regular.ttf diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 9a590bb6ddb6..73fb11155f3b 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -15,6 +15,10 @@ # Warning: this is actually a product definition, to be inherited from PRODUCT_COPY_FILES := \ + frameworks/base/data/fonts/Roboto-Regular.ttf:system/fonts/Roboto-Regular.ttf \ + frameworks/base/data/fonts/Roboto-Bold.ttf:system/fonts/Roboto-Bold.ttf \ + frameworks/base/data/fonts/Roboto-Italic.ttf:system/fonts/Roboto-Italic.ttf \ + frameworks/base/data/fonts/Roboto-BoldItalic.ttf:system/fonts/Roboto-BoldItalic.ttf \ frameworks/base/data/fonts/DroidSans.ttf:system/fonts/DroidSans.ttf \ frameworks/base/data/fonts/DroidSans-Bold.ttf:system/fonts/DroidSans-Bold.ttf \ frameworks/base/data/fonts/DroidNaskh-Regular.ttf:system/fonts/DroidNaskh-Regular.ttf \ diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 8d8d02061b16..76a50025fba3 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -27,8 +27,10 @@ <name>verdana</name> </nameset> <fileset> - <file>DroidSans.ttf</file> - <file>DroidSans-Bold.ttf</file> + <file>Roboto-Regular.ttf</file> + <file>Roboto-Bold.ttf</file> + <file>Roboto-Italic.ttf</file> + <file>Roboto-BoldItalic.ttf</file> </fileset> </family> @@ -53,6 +55,16 @@ </fileset> </family> + <family> + <nameset> + <name>Droid Sans</name> + </nameset> + <fileset> + <file>DroidSans.ttf</file> + <file>DroidSans-Bold.ttf</file> + </fileset> + </family> + <family> <nameset> <name>monospace</name> diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java index 616990a19eec..18dacac3ff3b 100644 --- a/graphics/java/android/renderscript/Font.java +++ b/graphics/java/android/renderscript/Font.java @@ -89,10 +89,10 @@ public class Font extends BaseObj { FontFamily sansFamily = new FontFamily(); sansFamily.mNames = sSansNames; - sansFamily.mNormalFileName = "DroidSans.ttf"; - sansFamily.mBoldFileName = "DroidSans-Bold.ttf"; - sansFamily.mItalicFileName = "DroidSans.ttf"; - sansFamily.mBoldItalicFileName = "DroidSans-Bold.ttf"; + sansFamily.mNormalFileName = "Roboto-Regular.ttf"; + sansFamily.mBoldFileName = "Roboto-Bold.ttf"; + sansFamily.mItalicFileName = "Roboto-Italic.ttf"; + sansFamily.mBoldItalicFileName = "Roboto-BoldItalic.ttf"; addFamilyToMap(sansFamily); FontFamily serifFamily = new FontFamily(); diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp index ce674f420b11..3917ca19f80d 100644 --- a/libs/rs/rsFont.cpp +++ b/libs/rs/rsFont.cpp @@ -735,7 +735,7 @@ void FontState::renderText(const char *text, uint32_t len, int32_t x, int32_t y, Font *currentFont = mRSC->getFont(); if (!currentFont) { if (!mDefault.get()) { - String8 fontsDir("/fonts/DroidSans.ttf"); + String8 fontsDir("/fonts/Roboto-Regular.ttf"); String8 fullPath(getenv("ANDROID_ROOT")); fullPath += fontsDir; |