diff options
| author | Stephen Hines <srhines@google.com> | 2014-06-17 22:32:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-17 20:55:27 +0000 |
| commit | 6b605045b17baece0e653fca60d59572736323cd (patch) | |
| tree | b5306a2d0820128105da53405008649d41c2a331 /rs | |
| parent | d7e16851285e19cb412fc14635a9f3f74bc07e0c (diff) | |
| parent | 6f09d08a26a902d9476e4f32530970e8504232b7 (diff) | |
| download | frameworks_base-6b605045b17baece0e653fca60d59572736323cd.zip frameworks_base-6b605045b17baece0e653fca60d59572736323cd.tar.gz frameworks_base-6b605045b17baece0e653fca60d59572736323cd.tar.bz2 | |
Merge "Switch from Droid -> Noto for RS fonts."
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/Font.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index b22aeb7..4318b9d 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -111,10 +111,10 @@ public class Font extends BaseObj { FontFamily serifFamily = new FontFamily(); serifFamily.mNames = sSerifNames; - serifFamily.mNormalFileName = "DroidSerif-Regular.ttf"; - serifFamily.mBoldFileName = "DroidSerif-Bold.ttf"; - serifFamily.mItalicFileName = "DroidSerif-Italic.ttf"; - serifFamily.mBoldItalicFileName = "DroidSerif-BoldItalic.ttf"; + serifFamily.mNormalFileName = "NotoSerif-Regular.ttf"; + serifFamily.mBoldFileName = "NotoSerif-Bold.ttf"; + serifFamily.mItalicFileName = "NotoSerif-Italic.ttf"; + serifFamily.mBoldItalicFileName = "NotoSerif-BoldItalic.ttf"; addFamilyToMap(serifFamily); FontFamily monoFamily = new FontFamily(); |