Unhide FONT.
Change-Id: I86258076817bb8f34ce3bb76031df41c08750f8c
diff --git a/api/current.txt b/api/current.txt
index 0af3d80..94dcbbd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18532,6 +18532,7 @@
method public static deprecated android.renderscript.Element F64_2(android.renderscript.RenderScript);
method public static deprecated android.renderscript.Element F64_3(android.renderscript.RenderScript);
method public static deprecated android.renderscript.Element F64_4(android.renderscript.RenderScript);
+ method public static deprecated android.renderscript.Element FONT(android.renderscript.RenderScript);
method public static deprecated android.renderscript.Element I16(android.renderscript.RenderScript);
method public static deprecated android.renderscript.Element I16_2(android.renderscript.RenderScript);
method public static deprecated android.renderscript.Element I16_3(android.renderscript.RenderScript);
@@ -18617,6 +18618,7 @@
enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4;
enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION;
enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT;
+ enum_constant public static final android.renderscript.Element.DataType RS_FONT;
enum_constant public static final android.renderscript.Element.DataType RS_MESH;
enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT;
enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER;
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 @@
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 @@
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);