Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 159f0015: Merge change I98819b18 into eclair-mr2

Browse Source 
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp

* commit '159f0015418955501d8cf2744b0393db2e73f394':
  Allow resource and file URIs in ImageView.setImageURI()
This commit is contained in:
Bjorn Bringert
2009-12-09 23:35:07 -08:00
committed by Android Git Automerger
parent c0c7b32e0b 159f001541
commit deb83f9944
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/ImageView.java
View File

@@ -16,6 +16,7 @@
package android.widget; package android.widget;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@@ -489,7 +490,10 @@ public class ImageView extends View {
mUri = null; mUri = null;
} }
} else if (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 { try {
d = Drawable.createFromStream( d = Drawable.createFromStream(
mContext.getContentResolver().openInputStream(mUri), mContext.getContentResolver().openInputStream(mUri),