Bug 956858 - Make menu inaccessible during editing mode. r=wesj, a=sledru
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 08 Jan 2014 12:03:04 -0800
changeset 216809 91f4e2aed979
parent 216808 d6aa05e710f2
child 216810 de5e77b26504
push id3921
push userryanvm@gmail.com
push date2014-09-22 15:03 +0000
treeherdermozilla-beta@f8eec8fe1b2b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj, sledru
bugs956858
milestone33.0
Bug 956858 - Make menu inaccessible during editing mode. r=wesj, a=sledru
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2339,16 +2339,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);