Bug 1148550 - Update 3-dot menu icon to Material in tabs panel. r=mhaigh

--HG--
extra : commitid : J3feqqlbHuz
extra : rebase_source : 937dbb2def6ba53f2432e26c4c997353a52dbfb9

mobile/android/base/resources/layout-large-v11/browser_toolbar.xml

@@ -121,7 +121,7 @@
         <org.mozilla.gecko.widget.themed.ThemedImageView
                 android:id="@+id/menu_icon"
                 style="@style/UrlBar.ImageButton.BrowserToolbarColors"
-                android:layout_height="18dp"
+                android:layout_height="@dimen/browser_toolbar_menu_icon_height"
                 android:layout_width="wrap_content"
                 android:scaleType="centerInside"
                 android:src="@drawable/menu"

mobile/android/base/resources/layout/browser_toolbar.xml

@@ -47,7 +47,7 @@
         <org.mozilla.gecko.widget.themed.ThemedImageView
                 android:id="@+id/menu_icon"
                 style="@style/UrlBar.ImageButton"
-                android:layout_height="16dp"
+                android:layout_height="@dimen/browser_toolbar_menu_icon_height"
                 android:layout_width="wrap_content"
                 android:scaleType="centerInside"
                 android:layout_gravity="center"

mobile/android/base/resources/layout/tabs_panel_default.xml

@@ -43,14 +43,23 @@
                          android:contentDescription="@string/new_tab"
                          android:background="@drawable/action_bar_button_inverse"/>
 
-            <ImageButton android:id="@+id/menu"
+            <FrameLayout android:id="@+id/menu"
                          style="@style/UrlBar.ImageButton"
                          android:layout_width="@dimen/tabs_panel_button_width"
-                         android:padding="@dimen/browser_toolbar_button_padding"
-                         android:src="@drawable/menu"
-                         android:contentDescription="@string/menu"
                          android:background="@drawable/action_bar_button_inverse"
-                         android:visibility="gone"/>
+                         android:contentDescription="@string/menu"
+                         android:visibility="gone">
+
+                <ImageButton
+                        style="@style/UrlBar.ImageButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/browser_toolbar_menu_icon_height"
+                        android:layout_gravity="center"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/menu"
+                        android:tint="@color/tabs_tray_icon_grey"/>
+
+            </FrameLayout>
 
         </view>
 

mobile/android/base/resources/values/dimens.xml

@@ -21,6 +21,7 @@
     <dimen name="browser_toolbar_height_flipper">48dp</dimen>
     <dimen name="browser_toolbar_button_padding">12dp</dimen>
     <dimen name="browser_toolbar_icon_width">48dp</dimen>
+    <dimen name="browser_toolbar_menu_icon_height">16dp</dimen>
 
     <!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
          specify the actual size) because that would decrease the size of our hit target. -->

mobile/android/base/tabs/TabsPanel.java

@@ -80,7 +80,7 @@ public class TabsPanel extends LinearLayout
     private TabsLayoutChangeListener mLayoutChangeListener;
 
     private IconTabWidget mTabWidget;
-    private static ImageButton mMenuButton;
+    private static View mMenuButton;
     private static ImageButton mAddTab;
     private ImageButton mNavBackButton;
 
@@ -141,7 +141,7 @@ public class TabsPanel extends LinearLayout
 
         mTabWidget.setTabSelectionListener(this);
 
-        mMenuButton = (ImageButton) findViewById(R.id.menu);
+        mMenuButton = findViewById(R.id.menu);
         mMenuButton.setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View view) {