summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-05-27 15:32:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-27 15:32:44 -0700
commit0d54201b1e70f1a970f0f58338db88d51333d3e6 (patch)
tree26a4fc935cedb2e36daed9ca1ea0bc31fcfe63fe /core/java
parentc32c0093a4f1d9fd66c92690547edd722035c6f8 (diff)
parent3526556135e433504742c2ae4fcaada3525a6464 (diff)
downloadframeworks_base-0d54201b1e70f1a970f0f58338db88d51333d3e6.zip
frameworks_base-0d54201b1e70f1a970f0f58338db88d51333d3e6.tar.gz
frameworks_base-0d54201b1e70f1a970f0f58338db88d51333d3e6.tar.bz2
Merge "Fix bug 4399686 - missing menu after returning from fullscreen video playback in browser"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/ActionBarView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index ef8481f..31897ef 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -306,8 +306,9 @@ public class ActionBarView extends AbsActionBarView {
if (mMenuPresenter == null) {
mMenuPresenter = new ActionMenuPresenter();
mMenuPresenter.setCallback(cb);
- builder.addMenuPresenter(mMenuPresenter);
}
+ builder.addMenuPresenter(mMenuPresenter);
+
final ActionMenuView menuView = (ActionMenuView) mMenuPresenter.getMenuView(this);
final LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT);