commit 0edfd0be153dffcf4793f319b6aac4865f3cf142
author Chris Craik <ccraik@google.com> Fri Sep 05 17:30:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 17:30:50 2014 +0000
tree 49a1b19ceb05683f1625b2eea6879c75dca50a39
parent 982f21fec206e1e8100dd0739bb7c5a79a13dc84
parent 954ad629477176b891ab51fe55140fc6f11e2a5b

Merge "Hide color filter mutability" into lmp-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8d99940..fb52648 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11439,8 +11439,6 @@
     ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
     method public int getColor();
     method public android.graphics.PorterDuff.Mode getMode();
-    method public void setColor(int);
-    method public void setMode(android.graphics.PorterDuff.Mode);
   }
 
   public class PorterDuffXfermode extends android.graphics.Xfermode {

graphics/java/android/graphics/PorterDuffColorFilter.java

diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java
index c078c1c..705f5e6 100644
--- a/graphics/java/android/graphics/PorterDuffColorFilter.java
+++ b/graphics/java/android/graphics/PorterDuffColorFilter.java
@@ -60,6 +60,8 @@
      * @see Color
      * @see #getColor()
      * @see #getMode()
+     *
+     * @hide
      */
     public void setColor(int color) {
         mColor = color;
@@ -84,6 +86,8 @@
      * @see PorterDuff
      * @see #getMode()
      * @see #getColor()
+     *
+     * @hide
      */
     public void setMode(PorterDuff.Mode mode) {
         mMode = mode;