Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c1125dedfcb52644aabc175d749c89b3008e4337':
  Disable ActionBar animations pending more involved fix
This commit is contained in:
Chet Haase
2015-05-07 22:25:30 +00:00
committed by Android Git Automerger
parent 8b54293f11 c1125dedfc
commit 3d97900aaa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/ActionMenuPresenter.java
View File

@@ -61,6 +61,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
implements ActionProvider.SubUiVisibilityListener { implements ActionProvider.SubUiVisibilityListener {
private static final String TAG = "ActionMenuPresenter"; private static final String TAG = "ActionMenuPresenter";
private static final int ITEM_ANIMATION_DURATION = 150; private static final int ITEM_ANIMATION_DURATION = 150;
private static final boolean ACTIONBAR_ANIMATIONS_ENABLED = false;
private OverflowMenuButton mOverflowButton; private OverflowMenuButton mOverflowButton;
private boolean mReserveOverflow; private boolean mReserveOverflow;
@@ -414,7 +415,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
@Override @Override
public void updateMenuView(boolean cleared) { public void updateMenuView(boolean cleared) {
final ViewGroup menuViewParent = (ViewGroup) ((View) mMenuView).getParent(); final ViewGroup menuViewParent = (ViewGroup) ((View) mMenuView).getParent();
if (menuViewParent != null) { if (menuViewParent != null && ACTIONBAR_ANIMATIONS_ENABLED) {
setupItemAnimations(); setupItemAnimations();
} }
super.updateMenuView(cleared); super.updateMenuView(cleared);