TabGroups uses old BottomToolbarButton style

The tab strip uses the BottomToolbarButton style. The label CL modified
that style and it broke the tab strip buttons. This CL reverts the
BottomToolbarButton style to what it used to be and introduces a new
style, SplitToolbarButton, for use in the split toolbar.

Bug: 966355, 966356, 966357
Change-Id: I83f53649fad8e109d0a267eb7fb26e8e4e5c286e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625966Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662810}

chrome/android/java/res/layout/bottom_toolbar_browsing.xml

@@ -23,7 +23,7 @@
         <org.chromium.chrome.browser.toolbar.HomeButton
             android:id="@+id/home_button"
             app:tint="@color/standard_mode_tint"
-            style="@style/BottomToolbarButton"
+            style="@style/SplitToolbarButton"
             android:contentDescription="@string/accessibility_toolbar_btn_home" />
 
         <TextView
@@ -43,7 +43,7 @@
             android:id="@+id/share_button"
             android:src="@drawable/ic_share_white_24dp"
             app:tint="@color/standard_mode_tint"
-            style="@style/BottomToolbarButton"
+            style="@style/SplitToolbarButton"
             android:contentDescription="@string/share" />
 
         <TextView
@@ -93,7 +93,7 @@
 
         <org.chromium.chrome.browser.toolbar.TabSwitcherButtonView
             android:id="@+id/tab_switcher_button"
-            style="@style/BottomToolbarButton"
+            style="@style/SplitToolbarButton"
             android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default" />
 
         <TextView
@@ -110,7 +110,7 @@
         style="@style/BottomToolbarButtonWrapper" >
 
         <include layout="@layout/bottom_toolbar_menu_button"
-            style="@style/BottomToolbarButton" />
+            style="@style/SplitToolbarButton" />
 
         <TextView
             android:id="@+id/menu_button_label"

chrome/android/java/res/layout/bottom_toolbar_tab_switcher.xml

@@ -28,7 +28,7 @@
 
             <org.chromium.chrome.browser.toolbar.bottom.CloseAllTabsButton
                 android:id="@+id/close_all_tabs_button"
-                style="@style/BottomToolbarButtonWrapper"
+                style="@style/SplitToolbarButton"
                 android:src="@drawable/ic_close_all_tabs"
                 android:contentDescription="@string/accessibility_toolbar_btn_close_all_tabs"
                 app:tint="@color/standard_mode_tint" />
@@ -69,7 +69,7 @@
                 style="@style/BottomToolbarButtonWrapper" >
 
                 <include layout="@layout/bottom_toolbar_menu_button"
-                    style="@style/BottomToolbarButton" />
+                    style="@style/SplitToolbarButton" />
 
                 <TextView
                     android:id="@+id/menu_button_label"

chrome/android/java/res/values-v17/styles.xml

@@ -637,10 +637,13 @@
         <item name="android:layout_width">43dp</item>
         <item name="android:paddingEnd">3.5dp</item>
     </style>
-    <style name="BottomToolbarButton">
+    <style name="BottomToolbarButton" parent="ToolbarButton">
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+    <style name="SplitToolbarButton" parent="BottomToolbarButton">
         <item name="android:layout_height">24dp</item>
         <item name="android:layout_width">24dp</item>
-        <item name="android:layout_gravity">center</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:clickable">false</item>
     </style>