summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2013-07-30 13:01:40 -0700
committer Romain Guy <romainguy@google.com> 2013-07-30 13:01:40 -0700
commit84956d53f1e86b8c000f8994ea9040b71a30e321 (patch)
treed060acdb0c9837c055f488ce232b6cbc0fea12c2
parent8018c8db8221aa604b3c083e09d173cc27e53d83 (diff)
Add missing InsetDrawable.getDrawable() method
Change-Id: I216b0e8a327f495fd83ebac79013418dbae007b9
-rw-r--r--api/current.txt1
-rw-r--r--graphics/java/android/graphics/drawable/InsetDrawable.java7
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 4bacfa81c2cc..670eaf854645 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10076,6 +10076,7 @@ package android.graphics.drawable {
ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
method public void draw(android.graphics.Canvas);
+ method public android.graphics.drawable.Drawable getDrawable();
method public int getOpacity();
method public void invalidateDrawable(android.graphics.drawable.Drawable);
method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 6cc9d8f14524..e3a7e2bfa84e 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -261,6 +261,13 @@ public class InsetDrawable extends Drawable implements Drawable.Callback
return this;
}
+ /**
+ * Returns the drawable wrapped by this InsetDrawable. May be null.
+ */
+ public Drawable getDrawable() {
+ return mInsetState.mDrawable;
+ }
+
final static class InsetState extends ConstantState {
Drawable mDrawable;
int mChangingConfigurations;