Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ca73491 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 3d97900a: am c1125ded: Merge "Disable ActionBar animations pending more... 

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

* commit '3d97900a':
  Disable ActionBar animations pending more involved fix
parents 7f29a802 3d97900a

core/java/android/widget/ActionMenuPresenter.java

+2 −1
Original line number Diff line number Diff line
@@ -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);