summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-21 20:27:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-21 20:27:21 -0700
commit6e8f37db441228ffb7c1165f36a1289e0cc48896 (patch)
tree23c07f9df3e2c02a502521e7373ca7fed8a71748
parent08999d276db9b07c2fdd28d11ea6a20ca05aaa2e (diff)
parent331e2bffdbbbfe4f2d22fcc7a2464c0bb7491efe (diff)
downloadandroid_packages_apps_Snap-6e8f37db441228ffb7c1165f36a1289e0cc48896.tar.gz
android_packages_apps_Snap-6e8f37db441228ffb7c1165f36a1289e0cc48896.tar.bz2
android_packages_apps_Snap-6e8f37db441228ffb7c1165f36a1289e0cc48896.zip
Merge "Tweak transition animations" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/anim/StateTransitionAnimation.java4
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;