diff options
| author | Justin Ho <justinho@google.com> | 2011-08-12 07:25:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-12 07:25:47 -0700 |
| commit | 1213697980d58d4285cc77a5dd80a453f008a077 (patch) | |
| tree | df65680606e74b53bb03fc0cd62bbc28b95f840f /graphics | |
| parent | ba86443e8b8b83934a04c1c381d1c937d9f0093f (diff) | |
| parent | beb2b5cfdb79ac9147296e3a6bd21970a947a6f4 (diff) | |
| download | frameworks_base-1213697980d58d4285cc77a5dd80a453f008a077.zip frameworks_base-1213697980d58d4285cc77a5dd80a453f008a077.tar.gz frameworks_base-1213697980d58d4285cc77a5dd80a453f008a077.tar.bz2 | |
Merge "Replacing sans serif system font with Roboto"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Font.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java index 616990a..18dacac 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(); |