diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 23:32:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 23:32:58 -0800 |
| commit | 159f0015418955501d8cf2744b0393db2e73f394 (patch) | |
| tree | 2963465285718d66e9ca5f32aed8d692689b2323 /core/java | |
| parent | 45e77ce36ae1d26bcf35afb1f7662d7b6fb08212 (diff) | |
| parent | 0f8555b72861b7b9a233ab65b14055c98b145c91 (diff) | |
| download | frameworks_base-159f0015418955501d8cf2744b0393db2e73f394.zip frameworks_base-159f0015418955501d8cf2744b0393db2e73f394.tar.gz frameworks_base-159f0015418955501d8cf2744b0393db2e73f394.tar.bz2 | |
Merge change I98819b18 into eclair-mr2
* changes:
Allow resource and file URIs in ImageView.setImageURI()
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index b8f0a7e..8f24041 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -16,6 +16,7 @@ package android.widget; +import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -489,7 +490,10 @@ public class ImageView extends View { mUri = null; } } else if (mUri != null) { - if ("content".equals(mUri.getScheme())) { + String scheme = mUri.getScheme(); + if (ContentResolver.SCHEME_CONTENT.equals(scheme) + || ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme) + || ContentResolver.SCHEME_FILE.equals(scheme)) { try { d = Drawable.createFromStream( mContext.getContentResolver().openInputStream(mUri), |