summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-11-15 16:49:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-15 16:49:35 -0800
commitc028a5ee7e6998f8ab0239baf91634eadad021e8 (patch)
treee33727598331f27ef39eee4697aa45a5c0b2e63c /policy
parentb86c89c1a1070a076fcfec8e9bf743245a996d8b (diff)
parent8d12e201626239291fe2c4b31f97f2a14f01dea9 (diff)
downloadframeworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.zip
frameworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.tar.gz
frameworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.tar.bz2
Merge "Fix a couple interactions between action bar and options menus"
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index e99b74f..3dd6510 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -411,6 +411,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
public final void openPanel(int featureId, KeyEvent event) {
if (featureId == FEATURE_OPTIONS_PANEL && mActionBar != null &&
mActionBar.isOverflowReserved()) {
+ // Invalidate the options menu, we want a prepare event that the app can respond to.
+ invalidatePanelMenu(FEATURE_OPTIONS_PANEL);
mActionBar.showOverflowMenu();
} else {
openPanel(getPanelState(featureId, true), event);