commit 8f359e98b9f18064a75c80b9c9ad8bda2713c612
author Paul Westbrook <pwestbro@google.com> Wed Dec 19 12:23:57 2012 -0800
committer Paul Westbrook <pwestbro@google.com> Wed Dec 19 12:23:57 2012 -0800
tree 9d908145c9be41a23548ca587e7202218e8b06ca
parent fd925449925f3eb6e2ab6e1c50203c4a4bc165b2

Merge "Fix for panorama icon not always showing up in photo viewer"

Merge CL: https://googleplex-android-review.googlesource.com/#/c/246161

Change-Id: I8cc5f339b4ffde31eadc2412aa6389354cfea45b

src/com/android/ex/photo/PhotoViewActivity.java

diff --git a/src/com/android/ex/photo/PhotoViewActivity.java b/src/com/android/ex/photo/PhotoViewActivity.java
index 0d8db49..4f3f79c 100644
--- a/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/src/com/android/ex/photo/PhotoViewActivity.java
@@ -551,6 +551,10 @@
         }
     }
 
+    public void onNewPhotoLoaded() {
+        setViewActivated();
+    }
+
     protected boolean isFullScreen() {
         return mFullScreen;
     }

src/com/android/ex/photo/fragments/PhotoViewFragment.java

diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index 7725523..b2c9ac8 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -328,7 +328,9 @@
             mPhotoProgressBar.setVisibility(View.GONE);
         }
 
-        mCallback.setViewActivated();
+        if (data != null) {
+            mCallback.onNewPhotoLoaded();
+        }
         setViewVisibility();
     }