diff options
| author | Chet Haase <chet@google.com> | 2015-05-07 22:00:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 22:00:18 +0000 |
| commit | c1125dedfcb52644aabc175d749c89b3008e4337 (patch) | |
| tree | 7c830ca08662b66d53cfc1c6912726e6938775b0 /core | |
| parent | a18df8d6c7f7eb7c2cd6cff3dfe8decd177752fa (diff) | |
| parent | d96c87eb6464854822a2b26865785495a96105de (diff) | |
| download | frameworks_base-c1125dedfcb52644aabc175d749c89b3008e4337.zip frameworks_base-c1125dedfcb52644aabc175d749c89b3008e4337.tar.gz frameworks_base-c1125dedfcb52644aabc175d749c89b3008e4337.tar.bz2 | |
Merge "Disable ActionBar animations pending more involved fix" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ActionMenuPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class ActionMenuPresenter extends BaseMenuPresenter 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 @@ public class ActionMenuPresenter extends BaseMenuPresenter @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); |