From 97e1836e1b07d91f18de9669c46b0c941b643a72 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 20 Oct 2011 15:37:18 -0700
Subject: [PATCH] Bug 5275928 - Invasion of the monkeys

Fix a monkey bug where runnables set to open popup windows were being
left around.

Change-Id: I29f2c7763ab667c784b96b60ef0d7e04d358c4d9
---
 .../android/internal/widget/ActionBarContextView.java    | 9 +++++++++
 core/java/com/android/internal/widget/ActionBarView.java | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index 446dab114ddec..18d45f7c59581 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -93,6 +93,15 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
         a.recycle();
     }
 
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mActionMenuPresenter != null) {
+            mActionMenuPresenter.hideOverflowMenu();
+            mActionMenuPresenter.hideSubMenus();
+        }
+    }
+
     @Override
     public void setSplitActionBar(boolean split) {
         if (mSplitActionBar != split) {
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 61bce60b833a4..e131242a78238 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -285,6 +285,10 @@ public class ActionBarView extends AbsActionBarView {
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         removeCallbacks(mTabSelector);
+        if (mActionMenuPresenter != null) {
+            mActionMenuPresenter.hideOverflowMenu();
+            mActionMenuPresenter.hideSubMenus();
+        }
     }
 
     @Override