commit c1125dedfcb52644aabc175d749c89b3008e4337
author Chet Haase <chet@google.com> Thu May 07 22:00:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 07 22:00:18 2015 +0000
tree 7c830ca08662b66d53cfc1c6912726e6938775b0
parent a18df8d6c7f7eb7c2cd6cff3dfe8decd177752fa
parent d96c87eb6464854822a2b26865785495a96105de

Merge "Disable ActionBar animations pending more involved fix" into mnc-dev

core/java/android/widget/ActionMenuPresenter.java

diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java
index e0b0e1f..f08141c 100644
--- a/core/java/android/widget/ActionMenuPresenter.java
+++ b/core/java/android/widget/ActionMenuPresenter.java
@@ -61,6 +61,7 @@
         implements ActionProvider.SubUiVisibilityListener {
     private static final String TAG = "ActionMenuPresenter";
     private static final int ITEM_ANIMATION_DURATION = 150;
+    private static final boolean ACTIONBAR_ANIMATIONS_ENABLED = false;
 
     private OverflowMenuButton mOverflowButton;
     private boolean mReserveOverflow;
@@ -414,7 +415,7 @@
     @Override
     public void updateMenuView(boolean cleared) {
         final ViewGroup menuViewParent = (ViewGroup) ((View) mMenuView).getParent();
-        if (menuViewParent != null) {
+        if (menuViewParent != null && ACTIONBAR_ANIMATIONS_ENABLED) {
             setupItemAnimations();
         }
         super.updateMenuView(cleared);