diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index c55c07f..d49adc2 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -969,10 +969,6 @@ public class Activity extends ContextThemeWrapper mTitleReady = true; onTitleChanged(getTitle(), getTitleColor()); } - if (mWindow != null && mWindow.hasFeature(Window.FEATURE_ACTION_BAR)) { - // Invalidate the action bar menu so that it can initialize properly. - mWindow.invalidatePanelMenu(Window.FEATURE_ACTION_BAR); - } mCalled = true; } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 2299852..73fa93c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2412,8 +2412,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } } else { mActionBar = (ActionBarView) findViewById(com.android.internal.R.id.action_bar); - if (mActionBar != null && mActionBar.getTitle() == null) { - mActionBar.setWindowTitle(mTitle); + if (mActionBar != null) { + if (mActionBar.getTitle() == null) { + mActionBar.setWindowTitle(mTitle); + } + // Post the panel invalidate for later; avoid application onCreateOptionsMenu + // being called in the middle of onCreate or similar. + mDecor.post(new Runnable() { + public void run() { + invalidatePanelMenu(FEATURE_ACTION_BAR); + } + }); } } } |