Various transition tweaks/fixes in Gallery

Bug: 7376109
-Add new animation preset for photos based on UX feedback
-Fix showing of highlight when tapping album grid photo
-Move StateTransition enum to StateTransitionAnimation.State

Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2

1 files changed, 6 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index fefb2c807..3293e40f7 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -24,6 +24,7 @@ import android.os.Parcelable;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.android.gallery3d.anim.StateTransitionAnimation;
 import com.android.gallery3d.common.Utils;
 
 import java.util.Stack;
@@ -58,7 +59,7 @@ public class StateManager {
         if (!mStack.isEmpty()) {
             ActivityState top = getTopState();
             top.transitionOnNextPause(top.getClass(), klass,
-                    ActivityState.StateTransition.Incoming);
+                    StateTransitionAnimation.Transition.Incoming);
             if (mIsResumed) top.onPause();
         }
         state.initialize(mActivity, data);
@@ -84,7 +85,7 @@ public class StateManager {
         if (!mStack.isEmpty()) {
             ActivityState as = getTopState();
             as.transitionOnNextPause(as.getClass(), klass,
-                    ActivityState.StateTransition.Incoming);
+                    StateTransitionAnimation.Transition.Incoming);
             as.mReceivedResults = state.mResult;
             if (mIsResumed) as.onPause();
         } else {
@@ -194,7 +195,7 @@ public class StateManager {
         if (mIsResumed && fireOnPause) {
             if (top != null) {
                 state.transitionOnNextPause(state.getClass(), top.getClass(),
-                        ActivityState.StateTransition.Outgoing);
+                        StateTransitionAnimation.Transition.Outgoing);
             }
             state.onPause();
         }
@@ -216,7 +217,8 @@ public class StateManager {
         mStack.pop();
         if (!data.containsKey(PhotoPage.KEY_APP_BRIDGE)) {
             // Do not do the fade out stuff when we are switching camera modes
-            oldState.transitionOnNextPause(oldState.getClass(), klass, ActivityState.StateTransition.Incoming);
+            oldState.transitionOnNextPause(oldState.getClass(), klass,
+                    StateTransitionAnimation.Transition.Incoming);
         }
         if (mIsResumed) oldState.onPause();
         oldState.onDestroy();