Bug 956858: Make menu inaccessible during editing mode. r=wesj
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 08 Jan 2014 12:03:04 -0800
changeset 205064 47a4f171d3d316a60326a85c8a7fb73acb60dd7e
parent 205063 dc6a44c16a3729fe433d44903c82fd24e44b81b8
child 205065 1e0e069b5cc790084e098e5ae2bc65494da03ac0
push id8713
push usermichael.l.comella@gmail.com
push dateFri, 12 Sep 2014 19:57:02 +0000
treeherderfx-team@47a4f171d3d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj
bugs956858
milestone35.0a1
Bug 956858: Make menu inaccessible during editing mode. r=wesj
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2468,16 +2468,21 @@ public class BrowserApp extends GeckoApp
             share.setActionProvider(provider);
         }
 
         return true;
     }
 
     @Override
     public void openOptionsMenu() {
+        // Disable menu access (for hardware buttons) when the software menu button is inaccessible.
+        if (mBrowserToolbar.isEditing()) {
+            return;
+        }
+
         if (areTabsShown()) {
             mTabsPanel.showMenu();
             return;
         }
 
         // Scroll custom menu to the top
         if (mMenuPanel != null)
             mMenuPanel.scrollTo(0, 0);