am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev

* commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5':
  Hide other color filter mutability

4 files changed, 18 insertions, 12 deletions

diff --git a/api/current.txt b/api/current.txt
index 3ab4ce4..17588c7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10707,9 +10707,6 @@ package android.graphics {
   public class ColorMatrixColorFilter extends android.graphics.ColorFilter {
     ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);
     ctor public ColorMatrixColorFilter(float[]);
-    method public android.graphics.ColorMatrix getColorMatrix();
-    method public void setColorMatrix(android.graphics.ColorMatrix);
-    method public void setColorMatrix(float[]);
   }
 
   public class ComposePathEffect extends android.graphics.PathEffect {
@@ -10786,10 +10783,6 @@ package android.graphics {
 
   public class LightingColorFilter extends android.graphics.ColorFilter {
     ctor public LightingColorFilter(int, int);
-    method public int getColorAdd();
-    method public int getColorMultiply();
-    method public void setColorAdd(int);
-    method public void setColorMultiply(int);
   }
 
   public class LinearGradient extends android.graphics.Shader {
@@ -11295,8 +11288,6 @@ package android.graphics {
 
   public class PorterDuffColorFilter extends android.graphics.ColorFilter {
     ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
-    method public int getColor();
-    method public android.graphics.PorterDuff.Mode getMode();
   }
 
   public class PorterDuffXfermode extends android.graphics.Xfermode {
diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java
index 7822c41..291c8ff 100644
--- a/graphics/java/android/graphics/ColorMatrixColorFilter.java
+++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java
@@ -58,6 +58,8 @@ public class ColorMatrixColorFilter extends ColorFilter {
      * any effect until you call {@link #setColorMatrix(ColorMatrix)}.
      *
      * @see #setColorMatrix(ColorMatrix)
+     *
+     * @hide
      */
     public ColorMatrix getColorMatrix() {
         return mMatrix;
@@ -73,6 +75,8 @@ public class ColorMatrixColorFilter extends ColorFilter {
      * @see #getColorMatrix()
      * @see android.graphics.ColorMatrix#reset()
      * @see #setColorMatrix(float[])
+     *
+     * @hide
      */
     public void setColorMatrix(ColorMatrix matrix) {
         if (matrix == null) {
@@ -98,6 +102,8 @@ public class ColorMatrixColorFilter extends ColorFilter {
      *
      * @throws ArrayIndexOutOfBoundsException if the specified array's
      *         length is < 20
+     *
+     * @hide
      */
     public void setColorMatrix(float[] array) {
         if (array == null) {
diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java
index 70a3fe8..ad78430 100644
--- a/graphics/java/android/graphics/LightingColorFilter.java
+++ b/graphics/java/android/graphics/LightingColorFilter.java
@@ -44,9 +44,6 @@ public class LightingColorFilter extends ColorFilter {
      * Create a colorfilter that multiplies the RGB channels by one color,
      * and then adds a second color. The alpha components of the mul and add
      * arguments are ignored.
-     *
-     * @see #setColorMultiply(int)
-     * @see #setColorAdd(int)
      */
     public LightingColorFilter(int mul, int add) {
         mMul = mul;
@@ -59,6 +56,8 @@ public class LightingColorFilter extends ColorFilter {
      * color filter is applied.
      *
      * @see #setColorMultiply(int)
+     *
+     * @hide
      */
     public int getColorMultiply() {
         return mMul;
@@ -70,6 +69,8 @@ public class LightingColorFilter extends ColorFilter {
      * The alpha channel of this color is ignored.
      *
      * @see #getColorMultiply()
+     *
+     * @hide
      */
     public void setColorMultiply(int mul) {
         mMul = mul;
@@ -81,6 +82,8 @@ public class LightingColorFilter extends ColorFilter {
      * when the color filter is applied.
      *
      * @see #setColorAdd(int)
+     *
+     * @hide
      */
     public int getColorAdd() {
         return mAdd;
@@ -92,6 +95,8 @@ public class LightingColorFilter extends ColorFilter {
      * The alpha channel of this color is ignored.
      *
      * @see #getColorAdd()
+     *
+     * @hide
      */
     public void setColorAdd(int add) {
         mAdd = add;
diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java
index ff768b7..fe4f8b8 100644
--- a/graphics/java/android/graphics/PorterDuffColorFilter.java
+++ b/graphics/java/android/graphics/PorterDuffColorFilter.java
@@ -46,6 +46,8 @@ public class PorterDuffColorFilter extends ColorFilter {
      *
      * @see Color
      * @see #setColor(int)
+     *
+     * @hide
      */
     public int getColor() {
         return mColor;
@@ -74,6 +76,8 @@ public class PorterDuffColorFilter extends ColorFilter {
      *
      * @see PorterDuff
      * @see #setMode(android.graphics.PorterDuff.Mode)
+     *
+     * @hide
      */
     public PorterDuff.Mode getMode() {
         return mMode;