diff options
author | Mark Wei <markwei@google.com> | 2012-10-29 14:21:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 14:21:22 -0700 |
commit | 28ed566a7471cbd36c70bc9568840dd555dc64c3 (patch) | |
tree | bcf3c29e79e7fca3f11dbc8b060a1695bc9e4ef4 | |
parent | a27fb71f92f323b5d693942d219f66b886fad6e7 (diff) | |
parent | 5f0470b259c56dd5df171948d6efd4219a3a17f8 (diff) | |
download | android_frameworks_ex-28ed566a7471cbd36c70bc9568840dd555dc64c3.tar.gz android_frameworks_ex-28ed566a7471cbd36c70bc9568840dd555dc64c3.tar.bz2 android_frameworks_ex-28ed566a7471cbd36c70bc9568840dd555dc64c3.zip |
am 5f0470b2: Fix for panorama icon not always showing up in photo viewer.
* commit '5f0470b259c56dd5df171948d6efd4219a3a17f8':
Fix for panorama icon not always showing up in photo viewer.
-rw-r--r-- | photoviewer/src/com/android/ex/photo/PhotoViewActivity.java | 3 | ||||
-rw-r--r-- | photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java index 5231ca1..2a24e1f 100644 --- a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java +++ b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java @@ -532,4 +532,7 @@ public class PhotoViewActivity extends Activity implements postActionBarHideRunnableWithDelay(); } } + + public void onNewPhotoLoaded() { + } } diff --git a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java index 2ecbeb7..efb8145 100644 --- a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java +++ b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java @@ -302,8 +302,10 @@ public class PhotoViewFragment extends Fragment implements // Hide the progress bar as it isn't needed anymore. mPhotoProgressBar.setVisibility(View.GONE); } + if (data != null) { + mCallback.onNewPhotoLoaded(); + } - mCallback.setViewActivated(); setViewVisibility(); } |