drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6ceed12a: Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev

Browse Source 
* commit '6ceed12a6ccbbd348849c83b5e810b6325dad994':
  Fix an action bar menu order of operations bug
This commit is contained in:
Adam Powell
2013-03-27 15:11:33 -07:00
committed by Android Git Automerger
parent f513cb3827 6ceed12a6c
commit 3f1be07f0a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,6 +989,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
final Callback cb = getCallback(); final Callback cb = getCallback();
if (!mActionBar.isOverflowMenuShowing() || !toggleMenuMode) { if (!mActionBar.isOverflowMenuShowing() || !toggleMenuMode) {
if (cb != null && !isDestroyed() && mActionBar.getVisibility() == View.VISIBLE) { if (cb != null && !isDestroyed() && mActionBar.getVisibility() == View.VISIBLE) {
// If we have a menu invalidation pending, do it now.
if (mInvalidatePanelMenuPosted &&
(mInvalidatePanelMenuFeatures & (1 << FEATURE_OPTIONS_PANEL)) != 0) {
mDecor.removeCallbacks(mInvalidatePanelMenuRunnable);
mInvalidatePanelMenuRunnable.run();
}
final PanelFeatureState st = getPanelState(FEATURE_OPTIONS_PANEL, true); final PanelFeatureState st = getPanelState(FEATURE_OPTIONS_PANEL, true);
// If we don't have a menu or we're waiting for a full content refresh, // If we don't have a menu or we're waiting for a full content refresh,