summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2012-02-17 15:25:18 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-17 15:25:18 -0800
commitfef000e3fa968a8dd165753f16c1c4cd38d59f33 (patch)
treec4e5d1bf895eeaa0332e762203a20cd961707545
parentf5f5d61c611b6f2c699ba472972e0b5c33c82402 (diff)
parent482ae5f2388a07d60d7f3b54432120172af25eee (diff)
am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '482ae5f2388a07d60d7f3b54432120172af25eee': Bug 6021294 - Contextual action bar animation tweaks
-rw-r--r--core/java/com/android/internal/widget/ActionBarContextView.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index ed02636f1c6a..fa165272de7c 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -405,8 +405,7 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
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 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
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);
}
}