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

* commit '3157e73fb0ea392b8dd2a6bbf6b74d8dfa54cc52':
  Don't recycle action button views
This commit is contained in:
Adam Powell
2013-09-13 17:16:08 -07:00
committed by Android Git Automerger

View File

@@ -161,10 +161,8 @@ public class ActionMenuPresenter extends BaseMenuPresenter
public View getItemView(final MenuItemImpl item, View convertView, ViewGroup parent) {
View actionView = item.getActionView();
if (actionView == null || item.hasCollapsibleActionView()) {
if (!(convertView instanceof ActionMenuItemView)) {
convertView = null;
}
actionView = super.getItemView(item, convertView, parent);
// Don't recycle existing item views for action buttons; it interferes with transitions.
actionView = super.getItemView(item, null, parent);
}
actionView.setVisibility(item.isActionViewExpanded() ? View.GONE : View.VISIBLE);