summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-21 20:29:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-21 20:29:09 -0700
commit9556e015200f55047d66a86cf7c1608c67a926cd (patch)
treef0cad4638e42a068a8383564ab6d1f079526bb1e
parent3973b2db14b3ea6a9f82ef54cd1e16443076bc01 (diff)
parente42eca39c726bce2452ee9d9a1c4d4cb042031ba (diff)
downloadandroid_packages_apps_Gallery2-9556e015200f55047d66a86cf7c1608c67a926cd.tar.gz
android_packages_apps_Gallery2-9556e015200f55047d66a86cf7c1608c67a926cd.tar.bz2
android_packages_apps_Gallery2-9556e015200f55047d66a86cf7c1608c67a926cd.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.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;