Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366"

2012-01-05 19:41:23 -08:00
parent d4a69b4a1c cf06d7390c
commit 3dc5a2eacf
1 changed files with 4 additions and 4 deletions
--- a/core/java/android/animation/LayoutTransition.java
+++ b/core/java/android/animation/LayoutTransition.java
@@ -321,13 +321,13 @@ public class LayoutTransition {
    public long getStartDelay(int transitionType) {
        switch (transitionType) {
            case CHANGE_APPEARING:
-                return mChangingAppearingDuration;
+                return mChangingAppearingDelay;
            case CHANGE_DISAPPEARING:
-                return mChangingDisappearingDuration;
+                return mChangingDisappearingDelay;
            case APPEARING:
-                return mAppearingDuration;
+                return mAppearingDelay;
            case DISAPPEARING:
-                return mDisappearingDuration;
+                return mDisappearingDelay;
        }
        // shouldn't reach here
        return 0;