Revert "Deprecate"
This reverts commit a0c2eb27b408660b02fa248943166d6c7e447908.
Conflicts:
api/current.txt
graphics/java/android/renderscript/Element.java
graphics/java/android/renderscript/Script.java
Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963
diff --git a/graphics/java/android/renderscript/Matrix2f.java b/graphics/java/android/renderscript/Matrix2f.java
index 38b5316..acc5bd8 100644
--- a/graphics/java/android/renderscript/Matrix2f.java
+++ b/graphics/java/android/renderscript/Matrix2f.java
@@ -20,13 +20,13 @@
import android.util.Log;
-/** @deprecated renderscript is deprecated in J
+/**
* Class for exposing the native Renderscript rs_matrix2x2 type back to the Android system.
*
**/
public class Matrix2f {
- /** @deprecated renderscript is deprecated in J
+ /**
* Creates a new identity 2x2 matrix
*/
public Matrix2f() {
@@ -34,7 +34,7 @@
loadIdentity();
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Creates a new matrix and sets its values from the given
* parameter
*
@@ -46,7 +46,7 @@
System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Return a reference to the internal array representing matrix
* values. Modifying this array will also change the matrix
*
@@ -56,7 +56,7 @@
return mMat;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Returns the value for a given row and column
*
* @param i row of the value to return
@@ -68,7 +68,7 @@
return mMat[i*2 + j];
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets the value for a given row and column
*
* @param i row of the value to set
@@ -78,7 +78,7 @@
mMat[i*2 + j] = v;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets the matrix values to identity
*/
public void loadIdentity() {
@@ -89,7 +89,7 @@
mMat[3] = 1;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets the values of the matrix to those of the parameter
*
* @param src matrix to load the values from
@@ -98,7 +98,7 @@
System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets current values to be a rotation matrix of given angle
*
* @param rot rotation angle
@@ -114,7 +114,7 @@
mMat[3] = c;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets current values to be a scale matrix of given dimensions
*
* @param x scale component x
@@ -126,7 +126,7 @@
mMat[3] = y;
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets current values to be the result of multiplying two given
* matrices
*
@@ -147,7 +147,7 @@
}
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Post-multiplies the current matrix by a given parameter
*
* @param rhs right hand side to multiply by
@@ -157,7 +157,7 @@
tmp.loadMultiply(this, rhs);
load(tmp);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Modifies the current matrix by post-multiplying it with a
* rotation matrix of given angle
*
@@ -168,7 +168,7 @@
tmp.loadRotate(rot);
multiply(tmp);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Modifies the current matrix by post-multiplying it with a
* scale matrix of given dimensions
*
@@ -180,7 +180,7 @@
tmp.loadScale(x, y);
multiply(tmp);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Sets the current matrix to its transpose
*/
public void transpose() {