diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-14 00:08:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 00:08:14 -0700 |
| commit | d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc (patch) | |
| tree | c23203da4a1e481667aa156752be8d91df757893 | |
| parent | 07c3fac5195496cb18ec60c82ffc036fc567fd99 (diff) | |
| parent | a14c4dbc5719fdc95648a1cb4eb7b617836e2a35 (diff) | |
| download | android_packages_apps_Snap-d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc.tar.gz android_packages_apps_Snap-d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc.tar.bz2 android_packages_apps_Snap-d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc.zip | |
Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 6941f2914..dafe37921 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -262,11 +262,9 @@ public class AlbumSetPage extends ActivityState implements & MediaObject.SUPPORT_IMPORT) != 0) { data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true); } else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) { - if (targetSet.getMediaItemCount() == 1) { - PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); - data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT, - mSlotView.getSlotRect(slotIndex, mRootPane)); - } + PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); + data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT, + mSlotView.getSlotRect(slotIndex, mRootPane)); data.putInt(PhotoPage.KEY_INDEX_HINT, 0); data.putString(PhotoPage.KEY_MEDIA_SET_PATH, mediaPath); |