diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-14 12:59:10 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-08-14 19:59:50 +0000 |
| commit | 03d30a573b8bc8e169e153a0fffa053ffedcd5ee (patch) | |
| tree | 68640cc8777cf053fec72804e85a51d6cf20a1c3 /graphics/java | |
| parent | 8599a3358077d800e94000d5956a912205eec51b (diff) | |
| download | frameworks_base-03d30a573b8bc8e169e153a0fffa053ffedcd5ee.zip frameworks_base-03d30a573b8bc8e169e153a0fffa053ffedcd5ee.tar.gz frameworks_base-03d30a573b8bc8e169e153a0fffa053ffedcd5ee.tar.bz2 | |
Make sure we're obtaining themed drawables correctly
Change-Id: I446a3492f7bf5a897c5d698e61327af4b7840d85
Diffstat (limited to 'graphics/java')
4 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java index e3c03a9..0bc4fdf 100644 --- a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java @@ -275,7 +275,7 @@ public class AnimatedRotateDrawable extends Drawable implements Drawable.Callbac final int res = a.getResourceId(R.styleable.AnimatedRotateDrawable_drawable, 0); Drawable drawable = null; if (res > 0) { - drawable = r.getDrawable(res); + drawable = r.getDrawable(res, theme); } a.recycle(); diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 2cb7b03..fc38e8a 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -427,7 +427,7 @@ public class AnimatedStateListDrawable extends StateListDrawable { final Drawable dr; if (drawableRes != 0) { - dr = r.getDrawable(drawableRes); + dr = r.getDrawable(drawableRes, theme); } else { int type; while ((type = parser.next()) == XmlPullParser.TEXT) { @@ -473,7 +473,7 @@ public class AnimatedStateListDrawable extends StateListDrawable { final Drawable dr; if (drawableRes != 0) { - dr = r.getDrawable(drawableRes); + dr = r.getDrawable(drawableRes, theme); } else { int type; while ((type = parser.next()) == XmlPullParser.TEXT) { diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java index cef3377..5318fa7 100644 --- a/graphics/java/android/graphics/drawable/AnimationDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java @@ -313,7 +313,7 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An Drawable dr; if (drawableRes != 0) { - dr = r.getDrawable(drawableRes); + dr = r.getDrawable(drawableRes, theme); } else { while ((type=parser.next()) == XmlPullParser.TEXT) { // Empty diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index 983eb3b..63b9e02 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -436,7 +436,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { com.android.internal.R.styleable.RotateDrawable_drawable, 0); Drawable drawable = null; if (res > 0) { - drawable = r.getDrawable(res); + drawable = r.getDrawable(res, theme); } a.recycle(); |