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

Merge "Fix bug 5183332 - monkeys are jerks"

Browse Source
This commit is contained in:
Adam Powell
2011-08-18 11:30:48 -07:00
committed by Android (Google) Code Review
parent eacfe83888 84f4936dee
commit 97382f2e8e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -386,8 +386,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// Ditch the menu created above
st.menu = null;
// Don't show it in the action bar either
mActionBar.setMenu(null, mActionMenuPresenterCallback);
if (mActionBar != null) {
// Don't show it in the action bar either
mActionBar.setMenu(null, mActionMenuPresenterCallback);
}
return false;
}
@@ -409,9 +411,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
if (!cb.onPreparePanel(st.featureId, st.createdPanelView, st.menu)) {
// The app didn't want to show the menu for now but it still exists.
// Clear it out of the action bar.
mActionBar.setMenu(null, mActionMenuPresenterCallback);
if (mActionBar != null) {
// The app didn't want to show the menu for now but it still exists.
// Clear it out of the action bar.
mActionBar.setMenu(null, mActionMenuPresenterCallback);
}
st.menu.startDispatchingItemsChanged();
return false;
}