Consistent animations & up button behavior in Gallery

Bug: 7302857
Bug: 7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index c041b0e6f..10de5d201 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -57,6 +57,7 @@ public class StateManager {
         }
         if (!mStack.isEmpty()) {
             ActivityState top = getTopState();
+            top.fadeOutOnNextPause();
             if (mIsResumed) top.onPause();
         }
         state.initialize(mActivity, data);
@@ -81,6 +82,7 @@ public class StateManager {
 
         if (!mStack.isEmpty()) {
             ActivityState as = getTopState();
+            as.fadeOutOnNextPause();
             as.mReceivedResults = state.mResult;
             if (mIsResumed) as.onPause();
         } else {
@@ -207,6 +209,10 @@ public class StateManager {
         }
         // Remove the top state.
         mStack.pop();
+        if (!data.containsKey(PhotoPage.KEY_APP_BRIDGE)) {
+            // Do not do the fade out stuff when we are switching camera modes
+            oldState.fadeOutOnNextPause();
+        }
         if (mIsResumed) oldState.onPause();
         oldState.onDestroy();