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

Commit dafa2f92 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 61077382: am a7bbbabc: Merge "Some simple skip-layout optimizations for... 

am 61077382: am a7bbbabc: Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev

* commit '61077382':
  Some simple skip-layout optimizations for ImageView
parents 0109e70c 61077382

core/java/android/widget/ImageView.java

+18 −4
Original line number Diff line number Diff line
@@ -342,8 +342,15 @@ public class ImageView extends View { 
            updateDrawable(null);

            mResource = resId;

            mUri = null;



            final int oldWidth = mDrawableWidth;

            final int oldHeight = mDrawableHeight;



            resolveUri();



            if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {

                requestLayout();

            }

            invalidate();

        }

    }
@@ -367,8 +374,15 @@ public class ImageView extends View { 
            updateDrawable(null);

            mResource = 0;

            mUri = uri;



            final int oldWidth = mDrawableWidth;

            final int oldHeight = mDrawableHeight;



            resolveUri();



            if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {

                requestLayout();

            }

            invalidate();

        }

    }
@@ -383,8 +397,8 @@ public class ImageView extends View { 
            mResource = 0;

            mUri = null;



            int oldWidth = mDrawableWidth;

            int oldHeight = mDrawableHeight;

            final int oldWidth = mDrawableWidth;

            final int oldHeight = mDrawableHeight;



            updateDrawable(drawable);