summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/ActivityState.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-17 15:05:24 -0700
committerJohn Reck <jreck@google.com>2012-10-17 15:05:24 -0700
commit57731ee210c22382d33f6f562f9e7e66fce651de (patch)
treee420805a32fd42a4241e141214c83745c56c8caf /src/com/android/gallery3d/app/ActivityState.java
parent4104415e00090cdcac4a2f7408cc7ddc7d11c711 (diff)
downloadandroid_packages_apps_Gallery2-57731ee210c22382d33f6f562f9e7e66fce651de.tar.gz
android_packages_apps_Gallery2-57731ee210c22382d33f6f562f9e7e66fce651de.tar.bz2
android_packages_apps_Gallery2-57731ee210c22382d33f6f562f9e7e66fce651de.zip
Only fade out if texture creation succeeded
Bug: 7366597 Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r--src/com/android/gallery3d/app/ActivityState.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 3ea6896cb..fe2e89e7f 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -185,8 +185,9 @@ abstract public class ActivityState {
}
if (mWantFadeOut) {
mWantFadeOut = false;
- mActivity.getTransitionStore().put(KEY_TRANSITION_IN, true);
- PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mContentPane);
+ if (PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mContentPane)) {
+ mActivity.getTransitionStore().put(KEY_TRANSITION_IN, true);
+ }
}
}