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

Commit eb7c097b authored by Danny Baumann's avatar Danny Baumann
Browse files

Make ImageView drawable update more efficient in some cases. 

When updating the view's drawable via setImageResource or setImageURI,
make sure to skip the layout pass if the old and new drawable have equal
sizes. This follows what is already done for setDrawable().

Change-Id: If73d225e38d0a2f7c616c4aeb33f67bdaed390f1
parent ba9e20a2

core/java/android/widget/ImageView.java

+13 −14
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ public class ImageView extends View { 
    @android.view.RemotableViewMethod

    public void setImageResource(int resId) {

        if (mUri != null || mResource != resId) {

            updateDrawable(null);

            mResource = resId;

            mUri = null;
@@ -389,7 +388,6 @@ public class ImageView extends View { 
        if (mResource != 0 ||

                (mUri != uri &&

                 (uri == null || mUri == null || !uri.equals(mUri)))) {

            updateDrawable(null);

            mResource = 0;

            mUri = uri;
@@ -621,25 +619,26 @@ public class ImageView extends View { 
        }

    }



    private void resolveUri() {

        if (mDrawable != null) {

            return;

    private void ensureResolvedUri() {

        if (mDrawable == null) {

            resolveUri();

        }



        Resources rsrc = getResources();

        if (rsrc == null) {

            return;

    }



    private void resolveUri() {

        Drawable d = null;

        Resources rsrc = getResources();



        if (mResource != 0) {

        if (rsrc == null) {

            // Can't resolve any drawable, fall through to clearing the drawable

        } else if (mResource != 0) {

            try {

                d = rsrc.getDrawable(mResource);

            } catch (Exception e) {

                Log.w("ImageView", "Unable to find resource: " + mResource, e);

                // Don't try again.

                mUri = null;

                mResource = 0;

            }

        } else if (mUri != null) {

            String scheme = mUri.getScheme();
@@ -679,7 +678,7 @@ public class ImageView extends View { 
                mUri = null;

            }

        } else {

            return;

            // No drawable to resolve

        }



        updateDrawable(d);
@@ -757,7 +756,7 @@ public class ImageView extends View { 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        resolveUri();

        ensureResolvedUri();

        int w;

        int h;