Skip to content

Commit 9da1b5d

Browse files
committed
Unhide FONT.
Change-Id: I86258076817bb8f34ce3bb76031df41c08750f8c
1 parent 9b9e74e commit 9da1b5d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

api/current.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18532,6 +18532,7 @@ package android.renderscript {
1853218532
method public static deprecated android.renderscript.Element F64_2(android.renderscript.RenderScript);
1853318533
method public static deprecated android.renderscript.Element F64_3(android.renderscript.RenderScript);
1853418534
method public static deprecated android.renderscript.Element F64_4(android.renderscript.RenderScript);
18535+
method public static deprecated android.renderscript.Element FONT(android.renderscript.RenderScript);
1853518536
method public static deprecated android.renderscript.Element I16(android.renderscript.RenderScript);
1853618537
method public static deprecated android.renderscript.Element I16_2(android.renderscript.RenderScript);
1853718538
method public static deprecated android.renderscript.Element I16_3(android.renderscript.RenderScript);
@@ -18617,6 +18618,7 @@ package android.renderscript {
1861718618
enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4;
1861818619
enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION;
1861918620
enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT;
18621+
enum_constant public static final android.renderscript.Element.DataType RS_FONT;
1862018622
enum_constant public static final android.renderscript.Element.DataType RS_MESH;
1862118623
enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT;
1862218624
enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER;

graphics/java/android/renderscript/Element.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ public enum DataType {
149149
RS_PROGRAM_VERTEX (1007, 4),
150150
RS_PROGRAM_RASTER (1008, 4),
151151
RS_PROGRAM_STORE (1009, 4),
152-
/** @hide
153-
*/
154152
RS_FONT (1010, 4);
155153

156154
int mID;
@@ -498,8 +496,8 @@ public static Element PROGRAM_STORE(RenderScript rs) {
498496
return rs.mElement_PROGRAM_STORE;
499497
}
500498

501-
/** @hide
502-
*/
499+
/** @deprecated renderscript is deprecated in J
500+
*/
503501
public static Element FONT(RenderScript rs) {
504502
if(rs.mElement_FONT == null) {
505503
rs.mElement_FONT = createUser(rs, DataType.RS_FONT);

0 commit comments

Comments
 (0)