Bug 1054319 - Consolidate UrlBar.ImageButton default width in style (r=margaret)

mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml

@@ -19,8 +19,6 @@
 
     <ImageButton android:id="@+id/menu"
                  style="@style/UrlBar.ImageButton"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
                  android:padding="@dimen/browser_toolbar_button_padding"
                  android:src="@drawable/menu_tabs"
                  android:contentDescription="@string/menu"

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

@@ -88,7 +88,6 @@
 
     <org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/menu"
                                                 style="@style/UrlBar.ImageButton"
-                                                android:layout_width="56dip"
                                                 android:layout_alignParentRight="true"
                                                 android:contentDescription="@string/menu"
                                                 android:background="@drawable/action_bar_button"
@@ -113,7 +112,7 @@
          which is thus drawn on top, may be pressed. -->
     <org.mozilla.gecko.widget.ThemedImageView
             android:id="@+id/edit_cancel"
-            style="@style/UrlBar.ImageButton.Icon"
+            style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
             android:src="@drawable/close_edit_mode_selector"
             android:background="@drawable/action_bar_button"

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

@@ -53,7 +53,6 @@
 
     <org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/menu"
                                             style="@style/UrlBar.ImageButton"
-                                            android:layout_width="48dip"
                                             android:layout_alignParentRight="true"
                                             android:contentDescription="@string/menu"
                                             android:background="@drawable/shaped_button"
@@ -93,7 +92,7 @@
          depending on their location can properly layout. -->
     <org.mozilla.gecko.widget.ThemedImageView
             android:id="@+id/edit_cancel"
-            style="@style/UrlBar.ImageButton.Icon"
+            style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
             android:src="@drawable/close_edit_mode_selector"
             android:contentDescription="@string/edit_mode_cancel"

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

@@ -18,8 +18,6 @@
 
     <ImageButton android:id="@+id/add_tab"
                  style="@style/UrlBar.ImageButton"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
                  android:padding="@dimen/browser_toolbar_button_padding"
                  android:src="@drawable/tab_new_level"
                  android:contentDescription="@string/new_tab"
@@ -27,8 +25,6 @@
 
     <ImageButton android:id="@+id/menu"
                  style="@style/UrlBar.ImageButton"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
                  android:padding="@dimen/browser_toolbar_button_padding"
                  android:src="@drawable/menu_tabs"
                  android:contentDescription="@string/menu"

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

@@ -9,7 +9,6 @@
     <ImageButton android:id="@+id/favicon"
                  style="@style/UrlBar.ImageButton"
                  android:layout_width="@dimen/browser_toolbar_favicon_size"
-                 android:layout_height="match_parent"
                  android:scaleType="fitCenter"
                  android:paddingLeft="4dip"
                  android:paddingRight="4dip"

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

@@ -436,6 +436,7 @@
 
     <!-- URL bar - Image Button -->
     <style name="UrlBar.ImageButton" parent="UrlBar.Button">
+        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
         <item name="android:scaleType">center</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:background">@android:color/transparent</item>