summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-12 18:51:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-12 18:51:41 +0000
commit3358d5c0a7f1863e62bf032311ac7444d51f2e18 (patch)
tree325f33ccd139c5c54cb84e372afdd298b2846fef /api
parent5e789f03b2bd018ab44cb4d1018f3682f27fd510 (diff)
parentd8c18e81c0588a4e80bfe72fef769d758ed90f89 (diff)
downloadframeworks_base-3358d5c0a7f1863e62bf032311ac7444d51f2e18.zip
frameworks_base-3358d5c0a7f1863e62bf032311ac7444d51f2e18.tar.gz
frameworks_base-3358d5c0a7f1863e62bf032311ac7444d51f2e18.tar.bz2
Merge "API for adding layers to LayerDrawable"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
-rw-r--r--api/system-current.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index af61de8..07d6456 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11985,8 +11985,10 @@ package android.graphics.drawable {
public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
ctor public LayerDrawable(android.graphics.drawable.Drawable[]);
+ method public int addLayer(android.graphics.drawable.Drawable);
method public void draw(android.graphics.Canvas);
method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
+ method public int findIndexByLayerId(int);
method public android.graphics.drawable.Drawable getDrawable(int);
method public int getId(int);
method public int getLayerGravity(int);
@@ -11999,6 +12001,7 @@ package android.graphics.drawable {
method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setDrawable(int, android.graphics.drawable.Drawable);
method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);
method public void setId(int, int);
method public void setLayerGravity(int, int);
diff --git a/api/system-current.txt b/api/system-current.txt
index 6b50603..7949d33 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12259,8 +12259,10 @@ package android.graphics.drawable {
public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
ctor public LayerDrawable(android.graphics.drawable.Drawable[]);
+ method public int addLayer(android.graphics.drawable.Drawable);
method public void draw(android.graphics.Canvas);
method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
+ method public int findIndexByLayerId(int);
method public android.graphics.drawable.Drawable getDrawable(int);
method public int getId(int);
method public int getLayerGravity(int);
@@ -12273,6 +12275,7 @@ package android.graphics.drawable {
method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setDrawable(int, android.graphics.drawable.Drawable);
method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);
method public void setId(int, int);
method public void setLayerGravity(int, int);