am c0d0ddd: am fef000e: am 482ae5f: Bug 6021294 - Contextual action bar animation tweaks

adamp · Android Git Automerger · commit 1f0f9d28a18c · 2012-02-23T07:30:01.000-08:00
* commit 'c0d0dddc20827846dcf3235f7307ad76d2893ba6': Bug 6021294 - Contextual action bar animation tweaks
diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -405,8 +405,7 @@ private Animator makeInAnimation() {
                     View child = mMenuView.getChildAt(i);
                     child.setScaleY(0);
                     ObjectAnimator a = ObjectAnimator.ofFloat(child, "scaleY", 0, 1);
-                    a.setDuration(100);
-                    a.setStartDelay(j * 70);
+                    a.setDuration(300);
                     b.with(a);
                 }
             }
@@ -432,8 +431,7 @@ private Animator makeOutAnimation() {
                     View child = mMenuView.getChildAt(i);
                     child.setScaleY(0);
                     ObjectAnimator a = ObjectAnimator.ofFloat(child, "scaleY", 0);
-                    a.setDuration(100);
-                    a.setStartDelay(i * 70);
+                    a.setDuration(300);
                     b.with(a);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,7 @@ private Animator makeInAnimation() {`
`405`	`405`	`View child = mMenuView.getChildAt(i);`
`406`	`406`	`child.setScaleY(0);`
`407`	`407`	`ObjectAnimator a = ObjectAnimator.ofFloat(child, "scaleY", 0, 1);`
`408`		`- a.setDuration(100);`
`409`		`- a.setStartDelay(j * 70);`
	`408`	`+ a.setDuration(300);`
`410`	`409`	`b.with(a);`
`411`	`410`	`}`
`412`	`411`	`}`
`@@ -432,8 +431,7 @@ private Animator makeOutAnimation() {`
`432`	`431`	`View child = mMenuView.getChildAt(i);`
`433`	`432`	`child.setScaleY(0);`
`434`	`433`	`ObjectAnimator a = ObjectAnimator.ofFloat(child, "scaleY", 0);`
`435`		`- a.setDuration(100);`
`436`		`- a.setStartDelay(i * 70);`
	`434`	`+ a.setDuration(300);`
`437`	`435`	`b.with(a);`
`438`	`436`	`}`
`439`	`437`	`}`