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

Commit 7b3cdb0f authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 

* commit '6f090af3':
  Re-enable ActionMenuPresenter view recycling
parents 83fec542 6f090af3

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter 
    public View getItemView(final MenuItemImpl item, View convertView, ViewGroup parent) {

        View actionView = item.getActionView();

        if (actionView == null || item.hasCollapsibleActionView()) {

            // Don't recycle existing item views for action buttons; it interferes with transitions.

            actionView = super.getItemView(item, null, parent);

            actionView = super.getItemView(item, convertView, parent);

        }

        actionView.setVisibility(item.isActionViewExpanded() ? View.GONE : View.VISIBLE);