From 76d915955f04f841161b054e6c249a65c78ba0fd Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 13 Sep 2013 10:57:06 -0700
Subject: [PATCH] Don't recycle action button views

Recycling action button views interferes with transition
animations. Suppress menu item view recycling for them.

Change-Id: I69d7561e337be7e4a89b7cf30b6c9439f2d49cc2
---
 .../com/android/internal/view/menu/ActionMenuPresenter.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
index 0c2e7211fd117..d5ab0f2304d22 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
@@ -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);