Merge "Restore bounds when we recreate the placeholder and progress drawables." into klp-ub-dev

1 files changed, 2 insertions, 0 deletions

diff --git a/src/com/android/bitmap/drawable/ExtendedBitmapDrawable.java b/src/com/android/bitmap/drawable/ExtendedBitmapDrawable.java
index 55b980a..6d9f05f 100644
--- a/src/com/android/bitmap/drawable/ExtendedBitmapDrawable.java
+++ b/src/com/android/bitmap/drawable/ExtendedBitmapDrawable.java
@@ -118,6 +118,7 @@ public class ExtendedBitmapDrawable extends BasicBitmapDrawable implements
             mPlaceholder = new Placeholder(placeholder, mResources, placeholderWidth, placeholderHeight,
                     fadeOutDurationMs, mOpts);
             mPlaceholder.setCallback(this);
+            mPlaceholder.setBounds(getBounds());
 
             // Progress bar is optional.
             if (mOpts.progressBar != null) {
@@ -125,6 +126,7 @@ public class ExtendedBitmapDrawable extends BasicBitmapDrawable implements
                 mProgress = new Progress(mOpts.progressBar.getConstantState().newDrawable(mResources), mResources,
                         progressBarSize, progressBarSize, fadeOutDurationMs, mOpts);
                 mProgress.setCallback(this);
+                mProgress.setBounds(getBounds());
             } else {
                 mProgress = null;
             }