diff options
| author | Mark Wei <markwei@google.com> | 2014-03-26 17:00:34 -0700 |
|---|---|---|
| committer | Mark Wei <markwei@google.com> | 2014-03-26 17:00:34 -0700 |
| commit | d732a611bd661fc2ac3c801a545cfbba0f179484 (patch) | |
| tree | 2b524624292e8e201a0e0a94caf7481ef48f060f | |
| parent | 5b46c679794d2f4362e8064b0291c578835d75e0 (diff) | |
| download | bitmap-d732a611bd661fc2ac3c801a545cfbba0f179484.tar.gz | |
Fix bug where state changes were being suppressed if the drawable was offscreen.
Bug: 13563559
Change-Id: Iea22f1a4ae7b71dd6a555fdd2efb9047a61522a6
| -rw-r--r-- | src/com/android/bitmap/drawable/TileDrawable.java | 2 | ||||
| -rw-r--r-- | src/com/android/bitmap/view/BitmapDrawableImageView.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/bitmap/drawable/TileDrawable.java b/src/com/android/bitmap/drawable/TileDrawable.java index d188281..5c5c226 100644 --- a/src/com/android/bitmap/drawable/TileDrawable.java +++ b/src/com/android/bitmap/drawable/TileDrawable.java @@ -142,7 +142,7 @@ public class TileDrawable extends Drawable implements Drawable.Callback { setAlpha(255); } else { // fade out - if (mPaint.getAlpha() == 255 && !getBounds().isEmpty()) { + if (mPaint.getAlpha() == 255) { mFadeOutAnimator.start(); } } diff --git a/src/com/android/bitmap/view/BitmapDrawableImageView.java b/src/com/android/bitmap/view/BitmapDrawableImageView.java index e9df6d3..9a88f3f 100644 --- a/src/com/android/bitmap/view/BitmapDrawableImageView.java +++ b/src/com/android/bitmap/view/BitmapDrawableImageView.java @@ -118,7 +118,8 @@ public class BitmapDrawableImageView extends ImageView { protected void onAttachedToWindow() { super.onAttachedToWindow(); mAttachedToWindow = true; - if (mDrawable != null && mDrawable.getKey() == null) { + if (mDrawable != null && mDrawable.getKey() == null + && mDrawable.getPreviousKey() != null) { mDrawable.bind(mDrawable.getPreviousKey()); } } |