diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-18 14:02:16 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-10-18 15:25:15 -0700 |
commit | 548038a155d94f674e7afc622f2a5b356a6f5328 (patch) | |
tree | 5243f41b593ee83057bd995566c96b94b204336f /src/com/android/gallery3d/app/ActivityState.java | |
parent | 155195bb5fa12d4f16872af3c30fc26701785414 (diff) | |
download | android_packages_apps_Snap-548038a155d94f674e7afc622f2a5b356a6f5328.tar.gz android_packages_apps_Snap-548038a155d94f674e7afc622f2a5b356a6f5328.tar.bz2 android_packages_apps_Snap-548038a155d94f674e7afc622f2a5b356a6f5328.zip |
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
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index ff0b32c32..cdd91ff4d 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -71,8 +71,8 @@ abstract public class ActivityState { private static final String KEY_TRANSITION_IN = "transition-in"; - public static enum StateTransition { None, Outgoing, Incoming }; - private StateTransition mNextTransition = StateTransition.None; + private StateTransitionAnimation.Transition mNextTransition = + StateTransitionAnimation.Transition.None; private StateTransitionAnimation mIntroAnimation; private GLView mContentPane; @@ -81,7 +81,7 @@ abstract public class ActivityState { protected void setContentPane(GLView content) { mContentPane = content; - if (mNextTransition != StateTransition.None) { + if (mIntroAnimation != null) { mContentPane.setIntroAnimation(mIntroAnimation); mIntroAnimation = null; } @@ -174,11 +174,11 @@ abstract public class ActivityState { } protected void transitionOnNextPause(Class<? extends ActivityState> outgoing, - Class<? extends ActivityState> incoming, StateTransition hint) { + Class<? extends ActivityState> incoming, StateTransitionAnimation.Transition hint) { if (outgoing == PhotoPage.class && incoming == AlbumPage.class) { - mNextTransition = StateTransition.Outgoing; + mNextTransition = StateTransitionAnimation.Transition.Outgoing; } else if (outgoing == AlbumPage.class && incoming == PhotoPage.class) { - mNextTransition = StateTransition.Incoming; + mNextTransition = StateTransitionAnimation.Transition.PhotoIncoming; } else { mNextTransition = hint; } @@ -188,10 +188,10 @@ abstract public class ActivityState { if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) { ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver); } - if (mNextTransition != StateTransition.None) { + if (mNextTransition != StateTransitionAnimation.Transition.None) { mActivity.getTransitionStore().put(KEY_TRANSITION_IN, mNextTransition); PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mContentPane); - mNextTransition = StateTransition.None; + mNextTransition = StateTransitionAnimation.Transition.None; } } @@ -249,12 +249,10 @@ abstract public class ActivityState { RawTexture fade = mActivity.getTransitionStore().get( PreparePageFadeoutTexture.KEY_FADE_TEXTURE); mNextTransition = mActivity.getTransitionStore().get( - KEY_TRANSITION_IN, StateTransition.None); - if (mNextTransition != StateTransition.None) { - mIntroAnimation = new StateTransitionAnimation( - (mNextTransition == StateTransition.Incoming) ? - StateTransitionAnimation.Spec.INCOMING : - StateTransitionAnimation.Spec.OUTGOING, fade); + KEY_TRANSITION_IN, StateTransitionAnimation.Transition.None); + if (mNextTransition != StateTransitionAnimation.Transition.None) { + mIntroAnimation = new StateTransitionAnimation(mNextTransition, fade); + mNextTransition = StateTransitionAnimation.Transition.None; } } |