diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-21 20:29:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-21 20:29:09 -0700 |
commit | cd316a947a3fb09f4073eef75c252f001542773a (patch) | |
tree | b1bd32b1817ae5362fdb612e7971f53d7b2692b8 | |
parent | 05fbb32555ddbca8e09f32e29964329d946591e9 (diff) | |
parent | 6e8f37db441228ffb7c1165f36a1289e0cc48896 (diff) | |
download | android_packages_apps_Snap-cd316a947a3fb09f4073eef75c252f001542773a.tar.gz android_packages_apps_Snap-cd316a947a3fb09f4073eef75c252f001542773a.tar.bz2 android_packages_apps_Snap-cd316a947a3fb09f4073eef75c252f001542773a.zip |
am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
* commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba':
Tweak transition animations
-rw-r--r-- | src/com/android/gallery3d/anim/StateTransitionAnimation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/anim/StateTransitionAnimation.java b/src/com/android/gallery3d/anim/StateTransitionAnimation.java index 8428cb866..2f7a2ecdb 100644 --- a/src/com/android/gallery3d/anim/StateTransitionAnimation.java +++ b/src/com/android/gallery3d/anim/StateTransitionAnimation.java @@ -31,7 +31,7 @@ public class StateTransitionAnimation extends Animation { public static final Spec INCOMING; public static final Spec PHOTO_INCOMING; - public int duration = 330; + public int duration = 250; public float backgroundAlphaFrom = 0; public float backgroundAlphaTo = 0; public float backgroundScaleFrom = 0; @@ -48,7 +48,7 @@ public class StateTransitionAnimation extends Animation { static { OUTGOING = new Spec(); - OUTGOING.backgroundAlphaFrom = 1f; + OUTGOING.backgroundAlphaFrom = 0.5f; OUTGOING.backgroundAlphaTo = 0f; OUTGOING.backgroundScaleFrom = 1f; OUTGOING.backgroundScaleTo = 0f; |