summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-12 00:14:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-12 00:14:01 -0700
commitb5c28dec15896a8f75c47aed932b66ec11e01425 (patch)
tree38599b0e57bb6cb106279c6a9ffe0c31ba29acef
parenta9948ef755f665f1327ef80760df3858f1030454 (diff)
parent9159cccd5d7e840b04c2507bfe29c76e046a4f6f (diff)
downloadandroid_packages_apps_Gallery2-b5c28dec15896a8f75c47aed932b66ec11e01425.tar.gz
android_packages_apps_Gallery2-b5c28dec15896a8f75c47aed932b66ec11e01425.tar.bz2
android_packages_apps_Gallery2-b5c28dec15896a8f75c47aed932b66ec11e01425.zip
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index d9e8d7ee1..cbf9c1a62 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -560,6 +560,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
}
private void prepareAnimationBackToFilmstrip(int slotIndex) {
+ if (!mAlbumDataAdapter.isActive(slotIndex)) return;
prepareFadeOutTexture();
TransitionStore transitions = mActivity.getTransitionStore();
transitions.put(PhotoPage.KEY_INDEX_HINT, slotIndex);