commit c0d0dddc20827846dcf3235f7307ad76d2893ba6
author Adam Powell <adamp@google.com> Fri Feb 17 15:26:56 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 17 15:26:56 2012 -0800
tree 31839e276f69508b2322d14784ed7ef272a26a96
parent 058bd2ecbcf8057511b00685eddc4ff5061bdbc1
parent fef000e3fa968a8dd165753f16c1c4cd38d59f33

am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks

* commit 'fef000e3fa968a8dd165753f16c1c4cd38d59f33':
  Bug 6021294 - Contextual action bar animation tweaks

core/java/com/android/internal/widget/ActionBarContextView.java

diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index ed02636..fa16527 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -405,8 +405,7 @@
                     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 @@
                     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);
                 }
             }