diff options
author | Chris Craik <ccraik@google.com> | 2014-09-05 17:30:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 17:30:50 +0000 |
commit | 0edfd0be153dffcf4793f319b6aac4865f3cf142 (patch) | |
tree | 49a1b19ceb05683f1625b2eea6879c75dca50a39 | |
parent | 982f21fec206e1e8100dd0739bb7c5a79a13dc84 (diff) | |
parent | 954ad629477176b891ab51fe55140fc6f11e2a5b (diff) | |
download | frameworks_base-0edfd0be153dffcf4793f319b6aac4865f3cf142.zip frameworks_base-0edfd0be153dffcf4793f319b6aac4865f3cf142.tar.gz frameworks_base-0edfd0be153dffcf4793f319b6aac4865f3cf142.tar.bz2 |
Merge "Hide color filter mutability" into lmp-dev
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | graphics/java/android/graphics/PorterDuffColorFilter.java | 4 |
2 files changed, 4 insertions, 2 deletions
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 @@ package android.graphics { 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 { 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 @@ public class PorterDuffColorFilter extends ColorFilter { * @see Color * @see #getColor() * @see #getMode() + * + * @hide */ public void setColor(int color) { mColor = color; @@ -84,6 +86,8 @@ public class PorterDuffColorFilter extends ColorFilter { * @see PorterDuff * @see #getMode() * @see #getColor() + * + * @hide */ public void setMode(PorterDuff.Mode mode) { mMode = mode; |