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

Commit c1125ded authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

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

parents a18df8d6 d96c87eb

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);