am b2d7b02c: am 8ccea78c: Merge "Fix bug 3299208 - Some apps\' dialogs aren\'t show()ing successfully" into honeycomb

* commit 'b2d7b02c4f3e2a43e65985edc70db52e257dd673':
  Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully

1 files changed, 4 insertions, 9 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 546c7c3..76554a7 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -885,15 +885,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         final Menu parentMenu = subMenu.getRootMenu();
         final PanelFeatureState panel = findMenuPanel(parentMenu);
 
-        /*
-         * Use the panel open state to determine whether this is coming from an open panel
-         * or an action button. If it's an open panel we want to use MenuDialogHelper.
-         * If it's closed we want to grab the relevant view and create a popup anchored to it.
-         */
-        if (panel.isOpen) {
-            // The window manager will give us a valid window token
-            new MenuDialogHelper(subMenu).show(null);
-        } else if (hasFeature(FEATURE_ACTION_BAR)) {
+        if (hasFeature(FEATURE_ACTION_BAR) && panel.featureId == FEATURE_OPTIONS_PANEL) {
             mDecor.post(new Runnable() {
                 public void run() {
                     mActionButtonPopup = new ActionButtonSubmenu(getContext(), subMenu);
@@ -904,6 +896,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                     }
                 }
             });
+        } else {
+            // The window manager will give us a valid window token
+            new MenuDialogHelper(subMenu).show(null);
         }
 
         return true;