diff options
| author | Adam Powell <adamp@google.com> | 2010-08-17 17:28:56 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-08-17 18:06:15 -0700 |
| commit | e67a9dc83d3045f28aa2e19e5643d1875ea26b87 (patch) | |
| tree | 89c5ef8eea168e4cdfcb53cfd6dcabada5dd54a9 /core/java/android/app/Dialog.java | |
| parent | b04f7ad90b7d5d5e0998e3b56960004cf56e6e8f (diff) | |
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
Diffstat (limited to 'core/java/android/app/Dialog.java')
| -rw-r--r-- | core/java/android/app/Dialog.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index b4c138e1660e..274a2664a2e8 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; @@ -792,6 +795,13 @@ public class Dialog implements DialogInterface, Window.Callback, } /** + * @see Activity#invalidateOptionsMenu() + */ + public void invalidateOptionsMenu() { + mWindow.invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL); + } + + /** * @see Activity#onCreateContextMenu(ContextMenu, View, ContextMenuInfo) */ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { |