Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide FONT." into jb-dev

Browse Source
This commit is contained in:
Stephen Hines
2012-05-01 15:54:16 -07:00
committed by Android (Google) Code Review
parent 10e3e9a41a 9da1b5d030
commit a7228c882c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -18541,6 +18541,7 @@ package android.renderscript {
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 @@ package android.renderscript {
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;

6
graphics/java/android/renderscript/Element.java
View File

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