Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0

Author: adamp

core/java/com/android/internal/widget/ActionBarContextView.java

@@ -93,6 +93,15 @@ public ActionBarContextView(Context context, AttributeSet attrs, int defStyle) {
         a.recycle();
     }
 
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mActionMenuPresenter != null) {
+            mActionMenuPresenter.hideOverflowMenu();
+            mActionMenuPresenter.hideSubMenus();
+        }
+    }
+
     @Override
     public void setSplitActionBar(boolean split) {
         if (mSplitActionBar != split) {

core/java/com/android/internal/widget/ActionBarView.java

@@ -285,6 +285,10 @@ public void setWindowCallback(Window.Callback cb) {
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         removeCallbacks(mTabSelector);
+        if (mActionMenuPresenter != null) {
+            mActionMenuPresenter.hideOverflowMenu();
+            mActionMenuPresenter.hideSubMenus();
+        }
     }
 
     @Override