summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-02-03 18:40:20 -0800
committerAlan Viverette <alanv@google.com>2014-02-03 18:42:24 -0800
commit8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3 (patch)
treea067807fe9c905fda3568db98cb654a520e694f8 /core/java/android/widget/ImageView.java
parent8cff1a370e8d89c0a977b82cd8730ab791866808 (diff)
downloadframeworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.zip
frameworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.tar.gz
frameworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.tar.bz2
Add APIs for obtaining themed Drawable from Theme, Context
BUG: 12611005 Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 58e4e86..572302a 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -642,7 +642,7 @@ public class ImageView extends View {
if (mResource != 0) {
try {
- d = rsrc.getDrawable(mResource);
+ d = mContext.getDrawable(mResource);
} catch (Exception e) {
Log.w("ImageView", "Unable to find resource: " + mResource, e);
// Don't try again.
@@ -655,7 +655,7 @@ public class ImageView extends View {
// Load drawable through Resources, to get the source density information
ContentResolver.OpenResourceIdResult r =
mContext.getContentResolver().getResourceId(mUri);
- d = r.r.getDrawable(r.id);
+ d = r.r.getDrawable(r.id, mContext.getTheme());
} catch (Exception e) {
Log.w("ImageView", "Unable to open content: " + mUri, e);
}