commit cc5b49f07ff856677cdfdbb0ecff1dcaeaaedc66
author Adam Powell <adamp@google.com> Fri Jul 12 21:36:07 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 21:36:07 2013 +0000
tree d6f00dacc7432613730c846e6c21280ac7d294dc
parent 414e204199396f5754caaf3f3a786a21904ec472
parent b4c8ba49ac6ccce8e5c7904741f4adff05e37640

Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers"

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

diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java
index 39078ca..3d6b116 100644
--- a/core/java/com/android/internal/view/menu/MenuItemImpl.java
+++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java
@@ -616,7 +616,7 @@
 
     @Override
     public boolean expandActionView() {
-        if ((mShowAsAction & SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW) == 0 || mActionView == null) {
+        if (hasCollapsibleActionView()) {
             return false;
         }
 
@@ -653,7 +653,13 @@
     }
 
     public boolean hasCollapsibleActionView() {
-        return (mShowAsAction & SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW) != 0 && mActionView != null;
+        if ((mShowAsAction & SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW) != 0) {
+            if (mActionView == null && mActionProvider != null) {
+                mActionView = mActionProvider.onCreateActionView(this);
+            }
+            return mActionView != null;
+        }
+        return false;
     }
 
     public void setActionViewExpanded(boolean isExpanded) {