From 195fa6db5f45b1cd167bad1dc5dbfe4544bf69d8 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 25 Nov 2015 15:58:47 -0800
Subject: [PATCH] Bug 1209967 - review: Set menu buttons visible in xml &
 remove dynamic visibility. r=me

--HG--
extra : commitid : Adr5XQoRyOj
extra : rebase_source : 8bbc8b9426fa10c0f71f8240761d39f7c1bea739
---
 .../base/resources/layout-large-v11/browser_toolbar.xml        | 3 +--
 mobile/android/base/resources/layout/browser_toolbar.xml       | 3 +--
 mobile/android/base/resources/layout/tabs_panel_default.xml    | 3 +--
 mobile/android/base/tabs/TabsPanel.java                        | 1 -
 mobile/android/base/toolbar/BrowserToolbar.java                | 1 -
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index ae75032b0230..77a968369f03 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -124,8 +124,7 @@
             android:layout_toLeftOf="@id/menu_margin"
             android:layout_alignWithParentIfMissing="true"
             android:contentDescription="@string/menu"
-            android:background="@drawable/browser_toolbar_action_bar_button"
-            android:visibility="gone">
+            android:background="@drawable/browser_toolbar_action_bar_button">
 
         <org.mozilla.gecko.widget.themed.ThemedImageView
                 android:id="@+id/menu_icon"
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 496d096001bd..17d70e138466 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -41,8 +41,7 @@
             style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
             android:contentDescription="@string/menu"
-            android:background="@drawable/shaped_button"
-            android:visibility="gone">
+            android:background="@drawable/shaped_button">
 
         <org.mozilla.gecko.widget.themed.ThemedImageView
                 android:id="@+id/menu_icon"
diff --git a/mobile/android/base/resources/layout/tabs_panel_default.xml b/mobile/android/base/resources/layout/tabs_panel_default.xml
index 7a15b4f03a90..20e210391ef7 100644
--- a/mobile/android/base/resources/layout/tabs_panel_default.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -53,8 +53,7 @@
                          style="@style/UrlBar.ImageButton"
                          android:layout_width="@dimen/tabs_panel_button_width"
                          android:background="@drawable/action_bar_button_inverse"
-                         android:contentDescription="@string/menu"
-                         android:visibility="gone">
+                         android:contentDescription="@string/menu">
 
                 <ImageButton
                         style="@style/UrlBar.ImageButton"
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index fc362779eef0..b072cde465f9 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -367,7 +367,6 @@ public class TabsPanel extends LinearLayout
 
         mAddTab.setVisibility(View.VISIBLE);
 
-        mMenuButton.setVisibility(View.VISIBLE);
         mMenuButton.setEnabled(true);
         mPopupMenu.setAnchor(mMenuButton);
     }
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index db8127771724..2fdbfaba850b 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -319,7 +319,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         });
         tabsButton.setImageLevel(0);
 
-        menuButton.setVisibility(View.VISIBLE);
         menuButton.setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View view) {