summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-10-28 20:36:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-28 20:36:57 +0000
commit222cd91d239ad4eafafe8647ddb13f5355da523f (patch)
tree10e387d370850e16e3d5196ebcf4910f84e20583 /api/current.txt
parente694c95d25cb6a8aafb19770d435c458b4c18aab (diff)
parent519494e207322581075c8ea884fde9d33bb9209e (diff)
downloadframeworks_base-222cd91d239ad4eafafe8647ddb13f5355da523f.zip
frameworks_base-222cd91d239ad4eafafe8647ddb13f5355da523f.tar.gz
frameworks_base-222cd91d239ad4eafafe8647ddb13f5355da523f.tar.bz2
Merge "Add support for using ColorStateList in GradientDrawable"
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 197ece2..e24a412 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7628,8 +7628,11 @@ package android.content.res {
ctor public ColorStateList(int[][], int[]);
method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public int describeContents();
+ method public int getColorAt(int);
method public int getColorForState(int[], int);
+ method public int getCount();
method public int getDefaultColor();
+ method public int[] getStateSpecAt(int);
method public boolean isStateful();
method public static android.content.res.ColorStateList valueOf(int);
method public android.content.res.ColorStateList withAlpha(int);
@@ -10277,6 +10280,7 @@ package android.graphics.drawable {
method public android.graphics.drawable.GradientDrawable.Orientation getOrientation();
method public void setAlpha(int);
method public void setColor(int);
+ method public void setColor(android.content.res.ColorStateList);
method public void setColorFilter(android.graphics.ColorFilter);
method public void setColors(int[]);
method public void setCornerRadii(float[]);