diff options
| author | 2012-01-05 19:43:51 -0800 | |
|---|---|---|
| committer | 2012-01-05 19:43:51 -0800 | |
| commit | 3e27e56a8f3659c87e8b1e6e749b03b760246e73 (patch) | |
| tree | 32e2c8f1ba23ae5cc031f527bde9b0e7a8529416 | |
| parent | 03b17a2df574da89723e3c1a21242ac7bc854d43 (diff) | |
| parent | 3dc5a2eacfc6125e5299d42ac3ed64ec9e70d0fa (diff) | |
am 3dc5a2ea: Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366"
* commit '3dc5a2eacfc6125e5299d42ac3ed64ec9e70d0fa':
Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366
| -rw-r--r-- | core/java/android/animation/LayoutTransition.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java index 7f0ea991af12..894f4287f709 100644 --- 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; |