am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev

* commit 'd2e1e4474dbdd87a51a8d75c946d1a027b6655e4':
  Use same default duration (300) for animator resources as for other animators
This commit is contained in:
Chet Haase
2013-03-15 22:52:20 +00:00
committed by Android Git Automerger

View File

@@ -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);