diff options
author | Adam Powell <adamp@google.com> | 2011-10-27 17:46:07 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2011-11-11 18:47:45 -0800 |
commit | 72465ea7876da0de29c03d34c075d9d2a7c76548 (patch) | |
tree | 9970cc2be03d5b5dafc4f01ee970d1bd4265f94d | |
parent | 317ff787c2b59107acb623b0a7037865fca565c5 (diff) | |
download | base-72465ea7876da0de29c03d34c075d9d2a7c76548.tar.gz |
DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an
overflow menu under invalid circumstances.
Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
-rw-r--r-- | core/java/com/android/internal/view/menu/ActionMenuPresenter.java | 6 | ||||
-rw-r--r-- | core/java/com/android/internal/widget/ActionBarContextView.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java index f25d65fcdabd..530809b869c3 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java @@ -300,6 +300,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter public boolean hideOverflowMenu() { if (mPostedOpenRunnable != null && mMenuView != null) { ((View) mMenuView).removeCallbacks(mPostedOpenRunnable); + mPostedOpenRunnable = null; return true; } @@ -653,10 +654,11 @@ public class ActionMenuPresenter extends BaseMenuPresenter public void run() { mMenu.changeMenuMode(); - if (mPopup.tryShow()) { + final View menuView = (View) mMenuView; + if (menuView != null && menuView.getWindowToken() != null && mPopup.tryShow()) { mOverflowPopup = mPopup; - mPostedOpenRunnable = null; } + mPostedOpenRunnable = null; } } } diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 18d45f7c5958..ed02636f1c6a 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java @@ -216,6 +216,9 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi }); final MenuBuilder menu = (MenuBuilder) mode.getMenu(); + if (mActionMenuPresenter != null) { + mActionMenuPresenter.dismissPopupMenus(); + } mActionMenuPresenter = new ActionMenuPresenter(mContext); mActionMenuPresenter.setReserveOverflow(true); |