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

Author: adamp

policy/src/com/android/internal/policy/impl/PhoneWindow.java

@@ -888,7 +888,8 @@ private boolean performPanelShortcut(PanelFeatureState st, int keyCode, KeyEvent
             // 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 boolean performPanelIdentifierAction(int featureId, int id, int flags) {
 
         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;
     }