diff options
| author | 2013-03-15 22:50:05 +0000 | |
|---|---|---|
| committer | 2013-03-15 22:50:06 +0000 | |
| commit | d2e1e4474dbdd87a51a8d75c946d1a027b6655e4 (patch) | |
| tree | 4fd11d67f9936114397f07a7dd1d03aff981c65c | |
| parent | ec6c2059f99e3d8035ec05be0bf9885dea1f7b35 (diff) | |
| parent | d9e4a5c2e55883d4eab766d4ab6aee408cb260a0 (diff) | |
Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev
| -rw-r--r-- | core/java/android/animation/AnimatorInflater.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java index ed4036db7ff2..d753e322cf19 100644 --- a/core/java/android/animation/AnimatorInflater.java +++ b/core/java/android/animation/AnimatorInflater.java @@ -185,7 +185,7 @@ public class AnimatorInflater { TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Animator); - long duration = a.getInt(com.android.internal.R.styleable.Animator_duration, 0); + long duration = a.getInt(com.android.internal.R.styleable.Animator_duration, 300); long startDelay = a.getInt(com.android.internal.R.styleable.Animator_startOffset, 0); |