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

* commit '6f090af305eba51785bb9a6ec08fb9f86a73da98':
  Re-enable ActionMenuPresenter view recycling
This commit is contained in:
Adam Powell
2013-10-10 19:20:52 -07:00
committed by Android Git Automerger

View File

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