commit a7228c882c468aabaed41e4499805aa5474f0dec
author Stephen Hines <srhines@google.com> Tue May 01 15:54:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 01 15:54:16 2012 -0700
tree 39e1b5bb2a60507cf8868600704bc2077c5ca752
parent 10e3e9a41a2f2a401f2a7c17d5b87582b4d1b7fe
parent 9da1b5d0301e8d13be8c96cbd12dcda04fcf7118

Merge "Unhide FONT." into jb-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index ffc5df8e..45b6efe 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18541,6 +18541,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);
@@ -18626,6 +18627,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;

graphics/java/android/renderscript/Element.java

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);