summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/renderscript/Font.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-03-27 21:31:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-27 21:31:28 +0000
commit275812c2bb09a82efd7ea8d90b57c99ff51eab0a (patch)
tree88c1ed93480d5ef5631041c1b6ee970aacb3a88e /graphics/java/android/renderscript/Font.java
parentd72f932b8cbf461ebb79c249ce92b9b811122190 (diff)
downloadframeworks_base-275812c2bb09a82efd7ea8d90b57c99ff51eab0a.zip
frameworks_base-275812c2bb09a82efd7ea8d90b57c99ff51eab0a.tar.gz
frameworks_base-275812c2bb09a82efd7ea8d90b57c99ff51eab0a.tar.bz2
Revert "Remove all public mention of RS graphics from docs."
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190 Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
Diffstat (limited to 'graphics/java/android/renderscript/Font.java')
-rw-r--r--graphics/java/android/renderscript/Font.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java
index 1a8d5bf..8a49abb 100644
--- a/graphics/java/android/renderscript/Font.java
+++ b/graphics/java/android/renderscript/Font.java
@@ -30,9 +30,8 @@ import android.util.Log;
import android.util.TypedValue;
/**
- * @hide
* @deprecated in API 16
- * <p>This class gives users a simple way to draw hardware accelerated text.
+ * <p>This class gives users a simple way to draw hardware accelerated text.
* Internally, the glyphs are rendered using the Freetype library and an internal cache of
* rendered glyph bitmaps is maintained. Each font object represents a combination of a typeface,
* and point size. You can create multiple font objects to represent styles such as bold or italic text,
@@ -44,7 +43,7 @@ import android.util.TypedValue;
* render large batches of text in sequence. It is also more efficient to render multiple
* characters at once instead of one by one to improve draw call batching.</p>
* <p>Font color and transparency are not part of the font object and you can freely modify
- * them in the script to suit the user's rendering needs. Font colors work as a state machine.
+ * them in the script to suit the user's rendering needs. Font colors work as a state machine.
* Every new call to draw text uses the last color set in the script.</p>
**/
public class Font extends BaseObj {