commit 506dd08da59f66f2d2c75337e199d7049117ac17
author Andrew Sapperstein <asapperstein@google.com> Mon Nov 04 21:55:25 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 04 21:55:25 2013 -0800
tree 09a97624409c2adc01f52544ad6404274ed32f52
parent 871faa6faad0c11e910a1fb29404bf0ae2e7d87f
parent 61be90be69b3489471a8f6927737e9c850ed8051

am 61be90be: Fix b/11460582: Photos not rendering.

* commit '61be90be69b3489471a8f6927737e9c850ed8051':
  Fix b/11460582: Photos not rendering.

src/com/android/ex/photo/views/PhotoView.java

diff --git a/src/com/android/ex/photo/views/PhotoView.java b/src/com/android/ex/photo/views/PhotoView.java
index 87038a4..8abbcbf 100644
--- a/src/com/android/ex/photo/views/PhotoView.java
+++ b/src/com/android/ex/photo/views/PhotoView.java
@@ -448,6 +448,7 @@
     }
 
     public void bindDrawable(Drawable drawable) {
+        boolean changed = false;
         if (drawable != null && drawable != mDrawable) {
             // Clear previous state.
             if (mDrawable != null) {
@@ -462,9 +463,11 @@
             // Set a callback?
             mDrawable.setCallback(this);
 
-            configureBounds(true);
-            invalidate();
+            changed = true;
         }
+
+        configureBounds(changed);
+        invalidate();
     }
 
     /**