summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-04-30 16:36:04 -0700
committerStephen Hines <srhines@google.com>2012-05-01 00:29:52 -0700
commit9da1b5d0301e8d13be8c96cbd12dcda04fcf7118 (patch)
tree36c96afb51ac536166c6da6d0b148c18aaa6b057 /graphics/java
parent9b9e74eea1435e4c44eced0f65d301ff9c249c6a (diff)
downloadframeworks_base-9da1b5d0301e8d13be8c96cbd12dcda04fcf7118.zip
frameworks_base-9da1b5d0301e8d13be8c96cbd12dcda04fcf7118.tar.gz
frameworks_base-9da1b5d0301e8d13be8c96cbd12dcda04fcf7118.tar.bz2
Unhide FONT.
Change-Id: I86258076817bb8f34ce3bb76031df41c08750f8c
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/renderscript/Element.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index babe57e..6872310 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -149,8 +149,6 @@ public class Element extends BaseObj {
RS_PROGRAM_VERTEX (1007, 4),
RS_PROGRAM_RASTER (1008, 4),
RS_PROGRAM_STORE (1009, 4),
- /** @hide
- */
RS_FONT (1010, 4);
int mID;
@@ -498,8 +496,8 @@ public class Element extends BaseObj {
return rs.mElement_PROGRAM_STORE;
}
- /** @hide
- */
+ /** @deprecated renderscript is deprecated in J
+ */
public static Element FONT(RenderScript rs) {
if(rs.mElement_FONT == null) {
rs.mElement_FONT = createUser(rs, DataType.RS_FONT);