diff options
| author | Mark Wei <markwei@google.com> | 2012-10-29 16:51:28 -0700 |
|---|---|---|
| committer | Mark Wei <markwei@google.com> | 2012-10-29 17:00:02 -0700 |
| commit | 9dd5598ae90b252377fef14106436a73a868d29e (patch) | |
| tree | 0dc2d17e8173160a6c96567c2cbd91603c64ca9e /photoviewer | |
| parent | 7c21e19482274e618c7a1457ba5d7f4bfab614b0 (diff) | |
| parent | 28ed566a7471cbd36c70bc9568840dd555dc64c3 (diff) | |
| download | android_frameworks_ex-9dd5598ae90b252377fef14106436a73a868d29e.tar.gz android_frameworks_ex-9dd5598ae90b252377fef14106436a73a868d29e.tar.bz2 android_frameworks_ex-9dd5598ae90b252377fef14106436a73a868d29e.zip | |
resolved conflicts for merge of 28ed566a to master
Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9
Diffstat (limited to 'photoviewer')
| -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 30017da..6c32ae5 100644 --- a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java +++ b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java @@ -577,4 +577,7 @@ public class PhotoViewActivity extends Activity implements protected void setPhotoIndex(int index) { mPhotoIndex = index; } + + 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 a721b26..e62383a 100644 --- a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java +++ b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java @@ -309,8 +309,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(); } |