diff options
author | Mark Wei <markwei@google.com> | 2013-12-08 04:34:27 -0800 |
---|---|---|
committer | Mark Wei <markwei@google.com> | 2013-12-08 04:37:01 -0800 |
commit | b6ec2afe9710112214d79b36b2233fef6a52845a (patch) | |
tree | bb2c9e882208ba47ac77017a2d59d3e58056d668 /src/com/android/bitmap/view | |
parent | 19a41ec7aaace2ab0b117d0baaeb544c5667b240 (diff) | |
download | bitmap-b6ec2afe9710112214d79b36b2233fef6a52845a.tar.gz |
Allow placeholder drawable to be sized by the client. First try to use the
bounds, then try to use the intrinsic bounds.
When a key is null, set load state to FAILED instead of UNINITIALIZED. The
difference is that FAILED shows the placeholder as a static image while
UNINITIALIZED hides it.
Fix bug in BitmapDrawableImageView where detaching from the window would set
its drawable to null, throwing away state.
Change-Id: I0b3f6c931d750ec4042e13bc1cbcf2d63e260168
Diffstat (limited to 'src/com/android/bitmap/view')
-rw-r--r-- | src/com/android/bitmap/view/BitmapDrawableImageView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/bitmap/view/BitmapDrawableImageView.java b/src/com/android/bitmap/view/BitmapDrawableImageView.java index a55b864..b776c34 100644 --- a/src/com/android/bitmap/view/BitmapDrawableImageView.java +++ b/src/com/android/bitmap/view/BitmapDrawableImageView.java @@ -67,7 +67,6 @@ public class BitmapDrawableImageView extends ImageView { private void unbindDrawable() { if (mDrawable != null) { mDrawable.unbind(); - mDrawable = null; } } @@ -75,24 +74,28 @@ public class BitmapDrawableImageView extends ImageView { public void setImageResource(final int resId) { super.setImageResource(resId); unbindDrawable(); + mDrawable = null; } @Override public void setImageURI(final Uri uri) { super.setImageURI(uri); unbindDrawable(); + mDrawable = null; } @Override public void setImageDrawable(final Drawable drawable) { super.setImageDrawable(drawable); unbindDrawable(); + mDrawable = null; } @Override public void setImageBitmap(final Bitmap bm) { super.setImageBitmap(bm); unbindDrawable(); + mDrawable = null; } @Override |