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

Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances." into ics-mr0

Browse Source
This commit is contained in:
Adam Powell
2011-11-11 14:54:02 -08:00
committed by Android (Google) Code Review
parent 5f8b7269d6 63464c5229
commit 6200a4b7eb
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/view/menu/ActionMenuPresenter.java
View File

@@ -300,6 +300,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
public boolean hideOverflowMenu() { public boolean hideOverflowMenu() {
if (mPostedOpenRunnable != null && mMenuView != null) { if (mPostedOpenRunnable != null && mMenuView != null) {
((View) mMenuView).removeCallbacks(mPostedOpenRunnable); ((View) mMenuView).removeCallbacks(mPostedOpenRunnable);
mPostedOpenRunnable = null;
return true; return true;
} }
@@ -653,10 +654,11 @@ public class ActionMenuPresenter extends BaseMenuPresenter
public void run() { public void run() {
mMenu.changeMenuMode(); mMenu.changeMenuMode();
if (mPopup.tryShow()) { final View menuView = (View) mMenuView;
if (menuView != null && menuView.getWindowToken() != null && mPopup.tryShow()) {
mOverflowPopup = mPopup; mOverflowPopup = mPopup;
mPostedOpenRunnable = null;
} }
mPostedOpenRunnable = null;
} }
} }
} }

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

@@ -216,6 +216,9 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
}); });
final MenuBuilder menu = (MenuBuilder) mode.getMenu(); final MenuBuilder menu = (MenuBuilder) mode.getMenu();
if (mActionMenuPresenter != null) {
mActionMenuPresenter.dismissPopupMenus();
}
mActionMenuPresenter = new ActionMenuPresenter(mContext); mActionMenuPresenter = new ActionMenuPresenter(mContext);
mActionMenuPresenter.setReserveOverflow(true); mActionMenuPresenter.setReserveOverflow(true);