diff options
| author | Adam Powell <adamp@google.com> | 2011-06-23 10:11:49 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-06-23 10:11:49 -0700 |
| commit | 0b2be42a07fcb66ca0a5f70624c8871245b4f6fd (patch) | |
| tree | 7ef25440c6cdfaf207bd856cba52c49f07e7a2a0 | |
| parent | b59f67761155cfa696e9f7cadb83e4f645a55212 (diff) | |
| download | frameworks_base-0b2be42a07fcb66ca0a5f70624c8871245b4f6fd.zip frameworks_base-0b2be42a07fcb66ca0a5f70624c8871245b4f6fd.tar.gz frameworks_base-0b2be42a07fcb66ca0a5f70624c8871245b4f6fd.tar.bz2 | |
Fix bug 4595971 - Menu not prepared to be prepared
The menu key gets the menu ready on key down and shows it on key
up. Ensure on key up that we still have a valid menu before attempting
to show it.
Change-Id: I24e67fa0cdb14cb5471c087a5e9f55ec0b2edf9f
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index baa4ec3..7f6327d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -711,9 +711,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { mActionBar.isOverflowReserved()) { if (mActionBar.getVisibility() == View.VISIBLE) { if (!mActionBar.isOverflowMenuShowing()) { - final Callback cb = getCallback(); - if (cb != null && !isDestroyed() && - cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { + if (!isDestroyed() && preparePanel(st, event)) { playSoundEffect = mActionBar.showOverflowMenu(); } } else { |