diff --git a/mobile/android/base/menu/MenuItemActionBar.java b/mobile/android/base/menu/MenuItemActionBar.java
index 0317960b609..8bbe9e6b256 100644
--- a/mobile/android/base/menu/MenuItemActionBar.java
+++ b/mobile/android/base/menu/MenuItemActionBar.java
@@ -4,6 +4,7 @@
package org.mozilla.gecko.menu;
+import org.mozilla.gecko.NewTabletUI;
import org.mozilla.gecko.R;
import android.content.Context;
@@ -20,7 +21,9 @@ public class MenuItemActionBar extends ImageButton
}
public MenuItemActionBar(Context context, AttributeSet attrs) {
- this(context, attrs, R.attr.menuItemActionBarStyle);
+ // TODO: Remove this branch (and associated attr) when old tablet is removed.
+ this(context, attrs, (NewTabletUI.isEnabled(context)) ?
+ R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
}
public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {
diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
index f109edafa1c..d9e0938fb99 100644
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -51,12 +51,10 @@
android:paddingLeft="6dip"
android:paddingRight="4dip"/>
-
diff --git a/mobile/android/base/resources/values-large-v11/dimens.xml b/mobile/android/base/resources/values-large-v11/dimens.xml
index c52e78b580b..466d546804d 100644
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -15,6 +15,8 @@
-13dip
-6dp
+ 19dp
+
26sp
200dp
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index afa8cd646a6..9b198b9b17a 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -70,6 +70,13 @@
- fitCenter
+
+
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index 9783bcd7af7..a61dcb516ec 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -14,6 +14,9 @@
+
+
+
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 3e5f0ecf6bd..63ed3e8987a 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -93,6 +93,7 @@
- @style/Widget.GeckoMenuListView
- @style/Widget.HomeListView
- @style/Widget.MenuItemActionBar
+ - @style/Widget.MenuItemActionBar.NewTablet
- @style/GeckoActionBar.Button
- @style/Widget.MenuItemSecondaryActionBar
- @style/Widget.PanelGridView