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

am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev

Browse Source 
* commit 'a9ba2cdfc10f8bdeee2bd8fb95432df873003f44':
  Ensure ImageView.setImageResource() always resolves Drawable
This commit is contained in:
Alan Viverette
2014-10-30 00:57:06 +00:00
committed by Android Git Automerger
parent 3c5cc234ee a9ba2cdfc1
commit ce0bc26443
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,21 +386,21 @@ public class ImageView extends View {
*/ */
@android.view.RemotableViewMethod @android.view.RemotableViewMethod
public void setImageResource(int resId) { public void setImageResource(int resId) {
if (mUri != null || mResource != resId) { // The resource configuration may have changed, so we should always
final int oldWidth = mDrawableWidth; // try to load the resource even if the resId hasn't changed.
final int oldHeight = mDrawableHeight; final int oldWidth = mDrawableWidth;
final int oldHeight = mDrawableHeight;
updateDrawable(null); updateDrawable(null);
mResource = resId; mResource = resId;
mUri = null; mUri = null;
resolveUri(); resolveUri();
if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) { if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {
requestLayout(); requestLayout();
}
invalidate();
} }
invalidate();
} }
/** /**