summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2015-06-24 02:10:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-24 02:10:25 +0000
commit346872d5387fe66d13ea962abe031830abf40648 (patch)
tree7cbeaa179285af45971d3d80ef08f5f81d9043b3 /api/current.txt
parent25a5f3012805e0fbcf3610dc57ab5c28d25aab0f (diff)
parent24f11b1871f9def5d802d107897658c4b2b66ab5 (diff)
downloadframeworks_base-346872d5387fe66d13ea962abe031830abf40648.zip
frameworks_base-346872d5387fe66d13ea962abe031830abf40648.tar.gz
frameworks_base-346872d5387fe66d13ea962abe031830abf40648.tar.bz2
Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f5d6e94..aa07a97 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12453,6 +12453,9 @@ package android.graphics.drawable {
method public android.graphics.drawable.Drawable loadDrawable(android.content.Context);
method public void loadDrawableAsync(android.content.Context, android.os.Message);
method public void loadDrawableAsync(android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
+ method public android.graphics.drawable.Icon setTint(int);
+ method public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
+ method public android.graphics.drawable.Icon setTintMode(android.graphics.PorterDuff.Mode);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.graphics.drawable.Icon> CREATOR;
}