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

Merge "unhide AllocationAdapter APIs"

Browse Source
This commit is contained in:
Jason Sams
2015-03-20 22:14:25 +00:00
committed by Android (Google) Code Review
parent 3daef246bd 206666790a
commit 0590423d71
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -26726,8 +26726,11 @@ package android.renderscript {
public class AllocationAdapter extends android.renderscript.Allocation {
method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);
method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);
method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type);
method public void setArray(int, int);
method public void setFace(android.renderscript.Type.CubemapFace);
method public void setLOD(int);
method public void setX(int);
method public void setY(int);
method public void setZ(int);
}

3
api/system-current.txt
View File

@@ -28524,8 +28524,11 @@ package android.renderscript {
public class AllocationAdapter extends android.renderscript.Allocation {
method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);
method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);
method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type);
method public void setArray(int, int);
method public void setFace(android.renderscript.Type.CubemapFace);
method public void setLOD(int);
method public void setX(int);
method public void setY(int);
method public void setZ(int);
}

6
rs/java/android/renderscript/AllocationAdapter.java
View File

@@ -136,7 +136,7 @@ public class AllocationAdapter extends Allocation {
/**
* @hide
*
* Set the active X. The x value must be within the range for
* the allocation being adapted.
*
@@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation {
}
/**
* @hide
*
*/
public void setArray(int arrayNum, int arrayVal) {
if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) {
@@ -242,7 +242,7 @@ public class AllocationAdapter extends Allocation {
}
/**
* @hide
*
*
* Create an arbitrary window into the base allocation
* The type describes the shape of the window.