From e67a9dc83d3045f28aa2e19e5643d1875ea26b87 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 17 Aug 2010 17:28:56 -0700
Subject: [PATCH] Clean up some options menu/action bar menu handling for
 Dialogs.

Add Dialog#invalidateOptionsMenu so that dialogs hosting action bars
have a way to request a refresh of menu content.

Change-Id: I73aa22c2df1c5e60b94035e30af548f87073dbb9
---
 api/current.xml                   | 11 +++++++++++
 core/java/android/app/Dialog.java | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/api/current.xml b/api/current.xml
index 3ac429ccaba25..dd39281cc7697 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -26619,6 +26619,17 @@
  visibility="public"
 >
 </method>
+<method name="invalidateOptionsMenu"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isShowing"
  return="boolean"
  abstract="false"
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index b4c138e1660e3..274a2664a2e88 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -228,6 +228,9 @@ public class Dialog implements DialogInterface, Window.Callback,
     public void show() {
         if (mShowing) {
             if (mDecor != null) {
+                if (mWindow.hasFeature(Window.FEATURE_ACTION_BAR)) {
+                    mWindow.invalidatePanelMenu(Window.FEATURE_ACTION_BAR);
+                }
                 mDecor.setVisibility(View.VISIBLE);
             }
             return;
@@ -791,6 +794,13 @@ public class Dialog implements DialogInterface, Window.Callback,
         mWindow.closePanel(Window.FEATURE_OPTIONS_PANEL);
     }
 
+    /**
+     * @see Activity#invalidateOptionsMenu()
+     */
+    public void invalidateOptionsMenu() {
+        mWindow.invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
+    }
+
     /**
      * @see Activity#onCreateContextMenu(ContextMenu, View, ContextMenuInfo)
      */