From 66e95e3dcb617cce9552ae102106e55c92004347 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 12 Aug 2015 16:24:18 -0700
Subject: [PATCH] Bug 1193975 - Remove NewTablet from ImageButton style.
 r=mhaigh

I feel like there's a better way to do this than using *Base, but
this is our current convention.

--HG--
extra : commitid : 4AFy34jzKw1
extra : rebase_source : 3befc2781abc759fe715e435458965dd296af361
---
 .../base/resources/layout-large-v11/browser_toolbar.xml   | 8 ++++----
 mobile/android/base/resources/values-large-v11/styles.xml | 5 +----
 mobile/android/base/resources/values/styles.xml           | 7 +++++--
 3 files changed, 10 insertions(+), 10 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 4799f6f4e052..8c47e83ac258 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -56,7 +56,7 @@
             android:paddingLeft="18dp"/>
 
     <org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
-                                          style="@style/UrlBar.ImageButton.NewTablet"
+                                          style="@style/UrlBar.ImageButton"
                                           android:layout_width="@dimen/new_tablet_nav_button_width"
                                           android:layout_height="@dimen/new_tablet_nav_button_width"
                                           android:layout_centerVertical="true"
@@ -92,7 +92,7 @@
 
     <org.mozilla.gecko.widget.ThemedImageButton
             android:id="@+id/tabs"
-            style="@style/UrlBar.ImageButton.NewTablet"
+            style="@style/UrlBar.ImageButton"
             android:layout_toLeftOf="@id/menu"
             android:layout_alignWithParentIfMissing="true"
             android:background="@drawable/browser_toolbar_action_bar_button"/>
@@ -111,7 +111,7 @@
 
     <org.mozilla.gecko.widget.ThemedImageButton
             android:id="@+id/menu"
-            style="@style/UrlBar.ImageButton.NewTablet"
+            style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
             android:layout_marginRight="6dp"
             android:contentDescription="@string/menu"
@@ -120,7 +120,7 @@
 
     <org.mozilla.gecko.widget.ThemedImageView
             android:id="@+id/menu_icon"
-            style="@style/UrlBar.ImageButton.NewTablet"
+            style="@style/UrlBar.ImageButton"
             android:layout_alignLeft="@id/menu"
             android:layout_alignRight="@id/menu"
             android:src="@drawable/tablet_menu"
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index ddc29b608830..29575c28d00c 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -5,15 +5,12 @@
 
 <resources>
 
-    <style name="UrlBar.ImageButton.NewTablet">
+    <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
         <item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
     </style>
 
     <style name="UrlBar.ImageButton.TabCount.NewTablet">
         <item name="android:background">@drawable/tabs_count</item>
-
-        <!-- From UrlBar.ImageButton.NewTablet because we can't inherit directly. -->
-        <item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
     </style>
 
     <style name="UrlBar.Button.Container">
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 79694da514d9..860bd70bc665 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -478,13 +478,16 @@
     </style>
 
     <!-- URL bar - Image Button -->
-    <style name="UrlBar.ImageButton" parent="UrlBar.Button">
-        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+    <style name="UrlBar.ImageButtonBase" parent="UrlBar.Button">
         <item name="android:scaleType">center</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
 
+    <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
+        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+    </style>
+
     <!-- URL bar - Image Button - Icon -->
     <style name="UrlBar.ImageButton.Icon">
          <item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>