Bug 1106935 - Remove new tablet branch in MenuItemActionBar. r=mhaigh
☠☠ backed out by c17419e63808 ☠ ☠
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 03 Feb 2015 16:31:15 -0800
changeset 258395 9080887b3cc4a922a8721ca4a32134d886a27025
parent 258394 8ef3725e6a667e3e864d928045073149492051f3
child 258396 fb066050757e614338dd185e6f99cfdbdbf818ec
push id721
push userjlund@mozilla.com
push dateTue, 21 Apr 2015 23:03:33 +0000
treeherdermozilla-release@d27c9211ebb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1106935
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1106935 - Remove new tablet branch in MenuItemActionBar. r=mhaigh
mobile/android/base/menu/MenuItemActionBar.java
mobile/android/base/resources/values-large-v11/styles.xml
mobile/android/base/resources/values-large-v11/themes.xml
--- a/mobile/android/base/menu/MenuItemActionBar.java
+++ b/mobile/android/base/menu/MenuItemActionBar.java
@@ -17,19 +17,17 @@ public class MenuItemActionBar extends T
                                implements GeckoMenuItem.Layout {
     private static final String LOGTAG = "GeckoMenuItemActionBar";
 
     public MenuItemActionBar(Context context) {
         this(context, null);
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs) {
-        // TODO: Remove this branch (and associated attr) when old tablet is removed.
-        this(context, attrs, (NewTabletUI.isEnabled(context)) ?
-                R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
+        this(context, attrs, R.attr.menuItemActionBarStyle);
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
     @Override
     public void initialize(GeckoMenuItem item) {
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -70,33 +70,20 @@
     <style name="Toast" parent="ToastBase">
         <item name="android:layout_width">400dp</item>
 
         <!-- Same as pre-19 Toast style, but with no left and right margins.
              They're removed since large tablets are never going to be only 400dp wide. -->
     </style>
 
     <style name="Widget.MenuItemActionBar">
-        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
-        <item name="android:layout_height">@dimen/browser_toolbar_height</item>
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:scaleType">fitCenter</item>
-
-        <!-- We split up padding* because we can't override it in *.NewTablet otherwise. -->
-        <item name="android:paddingTop">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingBottom">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingLeft">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingRight">@dimen/browser_toolbar_button_padding</item>
-    </style>
-
-    <style name="Widget.MenuItemActionBar.NewTablet">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/new_tablet_action_bar_button</item>
         <item name="android:scaleType">center</item>
-        <item name="android:background">@drawable/new_tablet_action_bar_button</item>
 
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.
 
              Notes:
                  * The bookmarks star is larger than the reload button
                  * The reload button contains whitespace at the top of the image to lower it -->
         <item name="android:paddingTop">19dp</item>
--- a/mobile/android/base/resources/values-large-v11/themes.xml
+++ b/mobile/android/base/resources/values-large-v11/themes.xml
@@ -9,14 +9,13 @@
         Base application theme. This could be overridden by GeckoBaseTheme
         in other res/values-XXX/themes.xml.
     -->
     <style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>
     
 </resources>