diff options
| author | Adam Powell <adamp@google.com> | 2013-10-11 01:27:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 01:27:20 +0000 |
| commit | ebd1dca5ead3d36f7e21ab27b8eb6f4c612f7319 (patch) | |
| tree | 8bec7af92f039b7e1f24481d49f979af5488277b /core/java/com | |
| parent | 384f060f934e61f7a7425340506ae0f927cd9a01 (diff) | |
| parent | c3ca3ea3a937a20666e4f01fb1a9efb503ec274e (diff) | |
| download | frameworks_base-ebd1dca5ead3d36f7e21ab27b8eb6f4c612f7319.zip frameworks_base-ebd1dca5ead3d36f7e21ab27b8eb6f4c612f7319.tar.gz frameworks_base-ebd1dca5ead3d36f7e21ab27b8eb6f4c612f7319.tar.bz2 | |
Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/view/menu/ActionMenuPresenter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java index 23ed019..44e7ec1 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java @@ -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); |