diff options
| author | Stephen Hines <srhines@google.com> | 2011-06-23 17:07:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-23 17:07:10 -0700 |
| commit | 7c1747c13c75eb0197db979d48cb4f9c59d52201 (patch) | |
| tree | 190ec1ba61349ae60d48b1f857c60f1eb8c45bfb /graphics | |
| parent | 95c0f924b28651f45c13a971e718572d15a2682b (diff) | |
| parent | 3d782666d73c3ce0ffb77e71db7309bc3297ecb8 (diff) | |
| download | frameworks_base-7c1747c13c75eb0197db979d48cb4f9c59d52201.zip frameworks_base-7c1747c13c75eb0197db979d48cb4f9c59d52201.tar.gz frameworks_base-7c1747c13c75eb0197db979d48cb4f9c59d52201.tar.bz2 | |
Merge "Remove verbose logging, update test app and docs."
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Font.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java index fa27590..616990a 100644 --- a/graphics/java/android/renderscript/Font.java +++ b/graphics/java/android/renderscript/Font.java @@ -201,12 +201,14 @@ public class Font extends BaseObj { /** * Accepts one of the following family names as an argument - * and will attemp to produce the best match with a system font + * and will attempt to produce the best match with a system font: + * * "sans-serif" "arial" "helvetica" "tahoma" "verdana" * "serif" "times" "times new roman" "palatino" "georgia" "baskerville" * "goudy" "fantasy" "cursive" "ITC Stone Serif" * "monospace" "courier" "courier new" "monaco" - * Returns default font if no match could be found + * + * Returns default font if no match could be found. */ static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); |