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

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

Browse Source 
* commit '8ccea78c01a6098e96189799b46b72cbfeba7bae':
  Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully
This commit is contained in:
Adam Powell
2011-01-23 16:12:45 -08:00
committed by Android Git Automerger
parent 8c92a34294 8ccea78c01
commit b2d7b02c4f
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -885,15 +885,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
final Menu parentMenu = subMenu.getRootMenu(); final Menu parentMenu = subMenu.getRootMenu();
final PanelFeatureState panel = findMenuPanel(parentMenu); final PanelFeatureState panel = findMenuPanel(parentMenu);
/* if (hasFeature(FEATURE_ACTION_BAR) && panel.featureId == FEATURE_OPTIONS_PANEL) {
* 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)) {
mDecor.post(new Runnable() { mDecor.post(new Runnable() {
public void run() { public void run() {
mActionButtonPopup = new ActionButtonSubmenu(getContext(), subMenu); 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; return true;