Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b4a0319 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android (Google) Code Review
Browse files

Merge "Get correct density info when using resource URIs in ImageView"

parents 4cd9f545 9d8d9c22

core/java/android/widget/ImageView.java

+10 −2
Original line number Diff line number Diff line
@@ -491,8 +491,16 @@ public class ImageView extends View { 
            }

        } else if (mUri != null) {

            String scheme = mUri.getScheme();

            if (ContentResolver.SCHEME_CONTENT.equals(scheme)

                    || ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)

            if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)) {

                try {

                    // Load drawable through Resources, to get the source density information

                    ContentResolver.OpenResourceIdResult r =

                            mContext.getContentResolver().getResourceId(mUri);

                    d = r.r.getDrawable(r.id);

                } catch (Exception e) {

                    Log.w("ImageView", "Unable to open content: " + mUri, e);

                }

            } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)

                    || ContentResolver.SCHEME_FILE.equals(scheme)) {

                try {

                    d = Drawable.createFromStream(