commit | 97e1836e1b07d91f18de9669c46b0c941b643a72 | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Thu Oct 20 15:37:18 2011 -0700 |
committer | Adam Powell <adamp@google.com> | Thu Oct 20 15:38:05 2011 -0700 |
tree | 0cfa84f898cef07689dadd09a5eb9c7b45bc6a5d | |
parent | 957ad44e9c6f1415dae85a0177d37c3a69f1e955 [diff] |
Bug 5275928 - Invasion of the monkeys Fix a monkey bug where runnables set to open popup windows were being left around. Change-Id: I29f2c7763ab667c784b96b60ef0d7e04d358c4d9
diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 446dab1..18d45f7 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -94,6 +94,15 @@ } @Override + public void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (mActionMenuPresenter != null) { + mActionMenuPresenter.hideOverflowMenu(); + mActionMenuPresenter.hideSubMenus(); + } + } + + @Override public void setSplitActionBar(boolean split) { if (mSplitActionBar != split) { if (mActionMenuPresenter != null) {
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 61bce60..e131242 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -285,6 +285,10 @@ public void onDetachedFromWindow() { super.onDetachedFromWindow(); removeCallbacks(mTabSelector); + if (mActionMenuPresenter != null) { + mActionMenuPresenter.hideOverflowMenu(); + mActionMenuPresenter.hideSubMenus(); + } } @Override