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

Merge "Fix bug 5217267 - Action bars and menu shortcuts"

Browse Source
This commit is contained in:
Adam Powell
2011-08-29 12:07:52 -07:00
committed by Android (Google) Code Review
parent 5471781430 6055f3e0d6
commit 890be6b919
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,7 +888,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// Mark as handled
st.isHandled = true;
if ((flags & Menu.FLAG_PERFORM_NO_CLOSE) == 0) {
// Only close down the menu if we don't have an action bar keeping it open.
if ((flags & Menu.FLAG_PERFORM_NO_CLOSE) == 0 && mActionBar == null) {
closePanel(st, true);
}
}
@@ -909,7 +910,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
boolean res = st.menu.performIdentifierAction(id, flags);
closePanel(st, true);
// Only close down the menu if we don't have an action bar keeping it open.
if (mActionBar == null) {
closePanel(st, true);
}
return res;
}