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

Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-08-09 15:19:45 -07:00
committed by Android (Google) Code Review
parent 4e44348f91 f96ce02613
commit a7bbbabc15
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,8 +342,15 @@ public class ImageView extends View {
updateDrawable(null); updateDrawable(null);
mResource = resId; mResource = resId;
mUri = null; mUri = null;
final int oldWidth = mDrawableWidth;
final int oldHeight = mDrawableHeight;
resolveUri(); resolveUri();
requestLayout();
if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {
requestLayout();
}
invalidate(); invalidate();
} }
} }
@@ -367,8 +374,15 @@ public class ImageView extends View {
updateDrawable(null); updateDrawable(null);
mResource = 0; mResource = 0;
mUri = uri; mUri = uri;
final int oldWidth = mDrawableWidth;
final int oldHeight = mDrawableHeight;
resolveUri(); resolveUri();
requestLayout();
if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {
requestLayout();
}
invalidate(); invalidate();
} }
} }
@@ -383,8 +397,8 @@ public class ImageView extends View {
mResource = 0; mResource = 0;
mUri = null; mUri = null;
int oldWidth = mDrawableWidth; final int oldWidth = mDrawableWidth;
int oldHeight = mDrawableHeight; final int oldHeight = mDrawableHeight;
updateDrawable(drawable); updateDrawable(drawable);