diff options
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 8aa557bab4e3..f292c610f842 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -136,6 +136,7 @@ public class ImageView extends View { private int[] mState = null; private boolean mMergeState = false; + private boolean mHasLevelSet = false; private int mLevel = 0; @UnsupportedAppUsage private int mDrawableWidth; @@ -798,6 +799,7 @@ public class ImageView extends View { @android.view.RemotableViewMethod public void setImageLevel(int level) { mLevel = level; + mHasLevelSet = true; if (mDrawable != null) { mDrawable.setLevel(level); resizeFromDrawable(); @@ -1069,7 +1071,9 @@ public class ImageView extends View { : isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(); d.setVisible(visible, true); } - d.setLevel(mLevel); + if (mHasLevelSet) { + d.setLevel(mLevel); + } mDrawableWidth = d.getIntrinsicWidth(); mDrawableHeight = d.getIntrinsicHeight(); applyImageTint(); |