Bug 1134192 - Prevent the options menu from opening in fullscreen mode. r=mfinkle

This commit is contained in:
Michael Comella
2015-02-23 13:12:01 -08:00
parent bae03e0aa2
commit 51a4ec0da7

View File

@@ -72,6 +72,7 @@ import org.mozilla.gecko.toolbar.AutocompleteHandler;
import org.mozilla.gecko.toolbar.BrowserToolbar; import org.mozilla.gecko.toolbar.BrowserToolbar;
import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState; import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
import org.mozilla.gecko.toolbar.ToolbarProgressView; import org.mozilla.gecko.toolbar.ToolbarProgressView;
import org.mozilla.gecko.util.ActivityUtils;
import org.mozilla.gecko.util.Clipboard; import org.mozilla.gecko.util.Clipboard;
import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.EventCallback;
import org.mozilla.gecko.util.GamepadUtils; import org.mozilla.gecko.util.GamepadUtils;
@@ -2885,6 +2886,10 @@ public class BrowserApp extends GeckoApp
return; return;
} }
if (ActivityUtils.isFullScreen(this)) {
return;
}
if (areTabsShown()) { if (areTabsShown()) {
mTabsPanel.showMenu(); mTabsPanel.showMenu();
return; return;