Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-10-20 16:25:04 -07:00
committed by Android (Google) Code Review
parent 2159927f36 97e1836e1b
commit a5c371bf1f
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/ActionBarContextView.java
View File

@@ -93,6 +93,15 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
a.recycle(); a.recycle();
} }
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
if (mActionMenuPresenter != null) {
mActionMenuPresenter.hideOverflowMenu();
mActionMenuPresenter.hideSubMenus();
}
}
@Override @Override
public void setSplitActionBar(boolean split) { public void setSplitActionBar(boolean split) {
if (mSplitActionBar != split) { if (mSplitActionBar != split) {

4
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -285,6 +285,10 @@ public class ActionBarView extends AbsActionBarView {
public void onDetachedFromWindow() { public void onDetachedFromWindow() {
super.onDetachedFromWindow(); super.onDetachedFromWindow();
removeCallbacks(mTabSelector); removeCallbacks(mTabSelector);
if (mActionMenuPresenter != null) {
mActionMenuPresenter.hideOverflowMenu();
mActionMenuPresenter.hideSubMenus();
}
} }
@Override @Override