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

Commit 3cfc5995 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 

* commit '3157e73f':
  Don't recycle action button views
parents 00b3f942 3157e73f

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

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

    public View getItemView(final MenuItemImpl item, View convertView, ViewGroup parent) {

        View actionView = item.getActionView();

        View actionView = item.getActionView();

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

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

            if (!(convertView instanceof ActionMenuItemView)) {

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

                convertView = null;

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

            }

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

        }

        }

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

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