diff options
| author | Jason Sams <jsams@google.com> | 2015-03-20 22:14:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-20 22:14:26 +0000 |
| commit | 0590423d710a65c05ce8e8c65686f2ef4baae3e9 (patch) | |
| tree | 090a7e9df001823d1328d3e37fdd97de9e8d7d51 | |
| parent | 3daef246bdbc43879b2db996c11e7ecc1b0a9eec (diff) | |
| parent | 206666790ad35c5dcea3de1f85424ad6a5abbb4d (diff) | |
| download | frameworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.zip frameworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.tar.gz frameworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.tar.bz2 | |
Merge "unhide AllocationAdapter APIs"
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | rs/java/android/renderscript/AllocationAdapter.java | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index e162cdb..adfc0cb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); } diff --git a/api/system-current.txt b/api/system-current.txt index 0fa10c0..5b91f92 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); } diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java index 183726f..35d59dd 100644 --- a/rs/java/android/renderscript/AllocationAdapter.java +++ b/rs/java/android/renderscript/AllocationAdapter.java @@ -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. |