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

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

Browse Source
This commit is contained in:
Alan Viverette
2014-10-30 00:52:16 +00:00
committed by Android (Google) Code Review
parent 674a3a21cb d739d7bd8a
commit a9ba2cdfc1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,7 +386,8 @@ 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
// try to load the resource even if the resId hasn't changed.
final int oldWidth = mDrawableWidth; final int oldWidth = mDrawableWidth;
final int oldHeight = mDrawableHeight; final int oldHeight = mDrawableHeight;
@@ -401,7 +402,6 @@ public class ImageView extends View {
} }
invalidate(); invalidate();
} }
}
/** /**
* Sets the content of this ImageView to the specified Uri. * Sets the content of this ImageView to the specified Uri.