diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-22 06:51:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 06:51:10 +0000 |
| commit | db2ed8fdd1ddd3b43b710829d94b9fc8290e90b4 (patch) | |
| tree | 1c596e5e799f017851590507ecfca4be1b9dc413 /api | |
| parent | 94520c74608bfcd61ff987410a8018d87b75d734 (diff) | |
| parent | e7772d313b88e9fd3366670a9c8d1b145edef344 (diff) | |
| download | frameworks_base-db2ed8fdd1ddd3b43b710829d94b9fc8290e90b4.zip frameworks_base-db2ed8fdd1ddd3b43b710829d94b9fc8290e90b4.tar.gz frameworks_base-db2ed8fdd1ddd3b43b710829d94b9fc8290e90b4.tar.bz2 | |
Merge "Move setTint into Drawable, unhide getDirtyBounds on Drawable"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index c809379..c38a82f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11203,7 +11203,6 @@ package android.graphics.drawable { method public final android.graphics.Paint getPaint(); method public android.graphics.Shader.TileMode getTileModeX(); method public android.graphics.Shader.TileMode getTileModeY(); - method public android.content.res.ColorStateList getTint(); method public boolean hasAntiAlias(); method public boolean hasMipMap(); method public final boolean isAutoMirrored(); @@ -11218,8 +11217,6 @@ package android.graphics.drawable { method public void setTileModeX(android.graphics.Shader.TileMode); method public void setTileModeXY(android.graphics.Shader.TileMode, android.graphics.Shader.TileMode); method public final void setTileModeY(android.graphics.Shader.TileMode); - method public void setTint(android.content.res.ColorStateList); - method public void setTintMode(android.graphics.PorterDuff.Mode); } public class ClipDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { @@ -11272,6 +11269,7 @@ package android.graphics.drawable { method public android.graphics.ColorFilter getColorFilter(); method public android.graphics.drawable.Drawable.ConstantState getConstantState(); method public android.graphics.drawable.Drawable getCurrent(); + method public android.graphics.Rect getDirtyBounds(); method public int getIntrinsicHeight(); method public int getIntrinsicWidth(); method public final int getLevel(); @@ -11309,6 +11307,7 @@ package android.graphics.drawable { method public void setHotspotBounds(int, int, int, int); method public final boolean setLevel(int); method public boolean setState(int[]); + method public void setTint(android.content.res.ColorStateList, android.graphics.PorterDuff.Mode); method public boolean setVisible(boolean, boolean); method public void unscheduleSelf(java.lang.Runnable); } @@ -11464,14 +11463,11 @@ package android.graphics.drawable { method public void draw(android.graphics.Canvas); method public int getOpacity(); method public android.graphics.Paint getPaint(); - method public android.content.res.ColorStateList getTint(); method public void setAlpha(int); method public void setColorFilter(android.graphics.ColorFilter); method public void setTargetDensity(android.graphics.Canvas); method public void setTargetDensity(android.util.DisplayMetrics); method public void setTargetDensity(int); - method public void setTint(android.content.res.ColorStateList); - method public void setTintMode(android.graphics.PorterDuff.Mode); } public class PaintDrawable extends android.graphics.drawable.ShapeDrawable { @@ -11492,10 +11488,6 @@ package android.graphics.drawable { } public class RippleDrawable extends android.graphics.drawable.LayerDrawable { - method public android.graphics.Rect getDirtyBounds(); - method public android.content.res.ColorStateList getTint(); - method public void setTint(android.content.res.ColorStateList); - method public void setTintMode(android.graphics.PorterDuff.Mode); } public class RotateDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { |