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

Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev

Browse Source
This commit is contained in:
Chet Haase
2015-06-17 23:06:58 +00:00
committed by Android (Google) Code Review
parent 8872ca4d55 8473f5a768
commit 45bb0ca49a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ public class ImageView extends View {
protected boolean verifyDrawable(Drawable dr) { protected boolean verifyDrawable(Drawable dr) {
return mDrawable == dr || super.verifyDrawable(dr); return mDrawable == dr || super.verifyDrawable(dr);
} }
@Override @Override
public void jumpDrawablesToCurrentState() { public void jumpDrawablesToCurrentState() {
super.jumpDrawablesToCurrentState(); super.jumpDrawablesToCurrentState();
@@ -226,6 +226,15 @@ public class ImageView extends View {
@Override @Override
public void invalidateDrawable(Drawable dr) { public void invalidateDrawable(Drawable dr) {
if (dr == mDrawable) { if (dr == mDrawable) {
if (dr != null) {
// update cached drawable dimensions if they've changed
final int w = dr.getIntrinsicWidth();
final int h = dr.getIntrinsicHeight();
if (w != mDrawableWidth || h != mDrawableHeight) {
mDrawableWidth = w;
mDrawableHeight = h;
}
}
/* we invalidate the whole view in this case because it's very /* we invalidate the whole view in this case because it's very
* hard to know where the drawable actually is. This is made * hard to know where the drawable actually is. This is made
* complicated because of the offsets and transformations that * complicated because of the offsets and transformations that