Bug 776309: Support for 7" tablet-ish + phone-ish interface. [r=mbrubeck]

--HG--
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/reader.png => mobile/android/base/resources/drawable-large-hdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-hdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-hdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/tab_new.png => mobile/android/base/resources/drawable-large-hdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_bg.xml => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/reader.png => mobile/android/base/resources/drawable-large-mdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-mdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-mdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/tab_new.png => mobile/android/base/resources/drawable-large-mdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_back_button_bg.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_back_button_bg.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_back_button_pressed_bg.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_back_button_pressed_bg.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_texture_tablet.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_texture_tablet.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_default.9.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_awesomebar_go.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_awesomebar_search.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_forward.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_reload.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/reader.png => mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/remote_tabs_off.png => mobile/android/base/resources/drawable-large-xhdpi-v11/remote_tabs_off.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/remote_tabs_on.png => mobile/android/base/resources/drawable-large-xhdpi-v11/remote_tabs_on.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/site_security_identified.png => mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/site_security_verified.png => mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/tab_new.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/urlbar_stop.png => mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png
rename : mobile/android/base/resources/layout-xlarge/doorhangerpopup.xml => mobile/android/base/resources/layout-large-v11/doorhangerpopup.xml
rename : mobile/android/base/resources/layout-xlarge/site_identity_popup.xml => mobile/android/base/resources/layout-large-v11/site_identity_popup.xml
rename : mobile/android/base/resources/layout-xlarge/gecko_app.xml => mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in
rename : mobile/android/base/resources/layout-xlarge/tabs_panel_toolbar_menu.xml => mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml
rename : mobile/android/base/resources/layout/gecko_app.xml => mobile/android/base/resources/layout/gecko_app.xml.in
rename : mobile/android/base/resources/values-xlarge/styles.xml => mobile/android/base/resources/values-xlarge-v11/styles.xml
extra : rebase_source : a36dfaae46a01769dadcf2f70756f35e19f5bbe6

mobile/android/base/BrowserApp.java

@@ -289,7 +289,7 @@ abstract public class BrowserApp extends GeckoApp
     public View getActionBarLayout() {
         int actionBarRes;
 
-        if (GeckoApp.mAppContext.hasPermanentMenuKey())
+        if (!GeckoApp.mAppContext.hasPermanentMenuKey() || GeckoApp.mAppContext.isTablet())
            actionBarRes = R.layout.browser_toolbar_menu;
         else
            actionBarRes = R.layout.browser_toolbar;
@@ -300,6 +300,11 @@ abstract public class BrowserApp extends GeckoApp
         return actionBar;
     }
 
+    @Override
+    public boolean hasTabsSideBar() {
+        return (mTabsPanel != null && mTabsPanel.isSideBar());
+    }
+
     void addTab() {
         showAwesomebar(AwesomeBar.Target.NEW_TAB);
     }
@@ -324,7 +329,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     public boolean autoHideTabs() {
-        if (!isTablet() && areTabsShown()) {
+        if (!hasTabsSideBar() && areTabsShown()) {
             hideTabs();
             return true;
         }
@@ -346,7 +351,7 @@ abstract public class BrowserApp extends GeckoApp
         mMainLayoutAnimator = new PropertyAnimator(150);
         mMainLayoutAnimator.setPropertyAnimationListener(this);
 
-        if (isTablet()) {
+        if (hasTabsSideBar()) {
             mMainLayoutAnimator.attach(mBrowserToolbar.getLayout(),
                                        PropertyAnimator.Property.SHRINK_LEFT,
                                        width);
@@ -384,7 +389,7 @@ abstract public class BrowserApp extends GeckoApp
     public void onPropertyAnimationEnd() {
         mMainHandler.post(new Runnable() {
             public void run() {
-                if (isTablet() && mTabsPanel.isShown()) {
+                if (hasTabsSideBar() && mTabsPanel.isShown()) {
                     // Fake the gecko layout to have been shrunk, instead of sliding.
                     ((LinearLayout.LayoutParams) mGeckoLayout.getLayoutParams()).setMargins(mTabsPanel.getWidth(), 0, 0, 0);
                     mGeckoLayout.scrollTo(0, 0);

mobile/android/base/BrowserToolbar.java

@@ -214,13 +214,13 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
 
         mMenu = (ImageButton) mLayout.findViewById(R.id.menu);
         mActionItemBar = (LinearLayout) mLayout.findViewById(R.id.menu_items);
-        mHasSoftMenuButton = GeckoApp.mAppContext.hasPermanentMenuKey();
+        mHasSoftMenuButton = !GeckoApp.mAppContext.hasPermanentMenuKey();
 
         if (mHasSoftMenuButton) {
             mMenu.setVisibility(View.VISIBLE);
             mMenu.setOnClickListener(new Button.OnClickListener() {
                 public void onClick(View view) {
-                    if (!GeckoApp.mAppContext.isTablet() && GeckoApp.mAppContext.areTabsShown())
+                    if (!GeckoApp.mAppContext.hasTabsSideBar() && GeckoApp.mAppContext.areTabsShown())
                         return;
 
                     GeckoApp.mAppContext.openOptionsMenu();
@@ -316,7 +316,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
 
     private void toggleTabs() {
         if (GeckoApp.mAppContext.areTabsShown()) {
-            if (GeckoApp.mAppContext.isTablet())
+            if (GeckoApp.mAppContext.hasTabsSideBar())
                 GeckoApp.mAppContext.hideTabs();
         } else {
             // hide the virtual keyboard
@@ -369,7 +369,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         if (areTabsShown) {
             mTabs.getBackground().setLevel(TABS_EXPANDED);
 
-            if (!GeckoApp.mAppContext.isTablet()) {
+            if (!GeckoApp.mAppContext.hasTabsSideBar()) {
                 mTabs.setImageLevel(0);
                 mTabsCount.setVisibility(View.GONE);
                 mMenu.setImageLevel(TABS_EXPANDED);
@@ -381,7 +381,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
             mTabs.setImageLevel(TABS_CONTRACTED);
             mTabs.getBackground().setLevel(TABS_CONTRACTED);
 
-            if (!GeckoApp.mAppContext.isTablet()) {
+            if (!GeckoApp.mAppContext.hasTabsSideBar()) {
                 mTabsCount.setVisibility(View.VISIBLE);
                 mMenu.setImageLevel(TABS_CONTRACTED);
                 mMenu.getBackground().setLevel(TABS_CONTRACTED);

mobile/android/base/GeckoApp.java

@@ -122,6 +122,7 @@ abstract public class GeckoApp
     private static LaunchState sLaunchState = LaunchState.Launching;
 
     abstract public int getLayout();
+    abstract public boolean hasTabsSideBar();
     abstract protected String getDefaultProfileName();
 
     public static boolean checkLaunchState(LaunchState checkState) {
@@ -949,17 +950,13 @@ abstract public class GeckoApp
     public boolean areTabsShown() { return false; }
 
     public boolean hasPermanentMenuKey() {
-        boolean hasMenu = false;
+        boolean hasMenu = true;
 
         if (Build.VERSION.SDK_INT >= 11)
-            hasMenu = true;
+            hasMenu = false;
 
-        if (Build.VERSION.SDK_INT >= 14) {
-            if (!ViewConfiguration.get(GeckoApp.mAppContext).hasPermanentMenuKey())
-                hasMenu = true;
-            else
-                hasMenu = false;
-        }
+        if (Build.VERSION.SDK_INT >= 14)
+            hasMenu = ViewConfiguration.get(GeckoApp.mAppContext).hasPermanentMenuKey();
 
         return hasMenu;
     }
@@ -1669,7 +1666,8 @@ abstract public class GeckoApp
     public boolean isTablet() {
         int screenLayout = getResources().getConfiguration().screenLayout;
         return (Build.VERSION.SDK_INT >= 11 &&
-                ((screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE));
+                (((screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) || 
+                 ((screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE)));
     }
 
     /** Called when the activity is first created. */

mobile/android/base/Makefile.in

@@ -177,11 +177,14 @@ FENNEC_PP_JAVA_FILES = \
 
 FENNEC_PP_XML_FILES = \
   res/layout/abouthome_content.xml \
+  res/layout/gecko_app.xml \
+  res/layout-xlarge-v11/gecko_app.xml \
   res/layout/text_selection_handles.xml \
   res/xml/preferences.xml \
   res/menu/gecko_menu.xml \
   res/menu-v11/gecko_menu.xml \
   res/menu-v11/titlebar_contextmenu.xml \
+  res/menu-large-v11/gecko_menu.xml \
   res/menu-xlarge-v11/gecko_menu.xml \
   $(NULL)
 
@@ -283,7 +286,6 @@ RES_LAYOUT = \
   res/layout/doorhanger.xml \
   res/layout/find_in_page_content.xml \
   res/layout/font_size_preference.xml \
-  res/layout/gecko_app.xml \
   res/layout/web_app.xml \
   res/layout/launch_app_list.xml \
   res/layout/launch_app_listitem.xml \
@@ -321,16 +323,19 @@ RES_LAYOUT_LAND_V14 = \
   res/layout-land-v14/tabs_panel_toolbar_menu.xml \
   $(NULL)
 
+RES_LAYOUT_LARGE_V11 = \
+  res/layout-large-v11/awesomebar_search.xml \
+  res/layout-large-v11/browser_toolbar_menu.xml \
+  res/layout-large-v11/doorhangerpopup.xml \
+  res/layout-large-v11/site_identity_popup.xml \
+  res/layout-large-v11/tabs_panel_toolbar_menu.xml \
+  $(NULL)
+
 RES_LAYOUT_XLARGE_V11 = \
   res/layout-xlarge-v11/awesomebar_search.xml \
-  res/layout-xlarge-v11/browser_toolbar.xml \
   res/layout-xlarge-v11/browser_toolbar_menu.xml \
-  res/layout-xlarge-v11/doorhangerpopup.xml \
-  res/layout-xlarge-v11/gecko_app.xml \
   res/layout-xlarge-v11/remote_tabs_child.xml \
   res/layout-xlarge-v11/remote_tabs_group.xml \
-  res/layout-xlarge-v11/site_identity_popup.xml \
-  res/layout-xlarge-v11/tabs_panel_toolbar.xml \
   res/layout-xlarge-v11/tabs_panel_toolbar_menu.xml \
   res/layout-xlarge-v11/tabs_row.xml \
   $(NULL)
@@ -351,6 +356,10 @@ RES_VALUES_V11 = \
   res/values-v11/themes.xml \
   $(NULL)
 
+RES_VALUES_LARGE_V11 = \
+  res/values-large-v11/dimens.xml \
+  $(NULL)
+
 RES_VALUES_XLARGE_V11 = \
   res/values-xlarge-v11/dimens.xml \
   res/values-xlarge-v11/styles.xml \
@@ -760,26 +769,90 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
   res/drawable-land-xhdpi-v14/site_security_verified.png \
   $(NULL)
 
+RES_DRAWABLE_LARGE_MDPI_V11 = \
+  res/drawable-large-mdpi-v11/address_bar_bg_curve.png \
+  res/drawable-large-mdpi-v11/address_bar_bg.xml \
+  res/drawable-large-mdpi-v11/address_bar_texture_tablet.png \
+  res/drawable-large-mdpi-v11/address_bar_back_button_bg.png \
+  res/drawable-large-mdpi-v11/address_bar_back_button_pressed_bg.png \
+  res/drawable-large-mdpi-v11/address_bar_url_default.9.png \
+  res/drawable-large-mdpi-v11/address_bar_url_pressed.9.png \
+  res/drawable-large-mdpi-v11/ic_awesomebar_go.png \
+  res/drawable-large-mdpi-v11/ic_awesomebar_search.png \
+  res/drawable-large-mdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-large-mdpi-v11/ic_menu_reload.png \
+  res/drawable-large-mdpi-v11/ic_menu_forward.png \
+  res/drawable-large-mdpi-v11/remote_tabs_off.png \
+  res/drawable-large-mdpi-v11/remote_tabs_on.png \
+  res/drawable-large-mdpi-v11/tab_new.png \
+  res/drawable-large-mdpi-v11/urlbar_stop.png \
+  res/drawable-large-mdpi-v11/reader.png \
+  res/drawable-large-mdpi-v11/site_security_identified.png \
+  res/drawable-large-mdpi-v11/site_security_verified.png \
+  res/drawable-large-mdpi-v11/menu.png \
+  res/drawable-large-mdpi-v11/tabs_carat.png \
+  res/drawable-large-mdpi-v11/tabs_crop_normal.png \
+  res/drawable-large-mdpi-v11/tabs_crop_pressed.png \
+  $(NULL)
+
+RES_DRAWABLE_LARGE_HDPI_V11 = \
+  res/drawable-large-hdpi-v11/address_bar_bg_curve.png \
+  res/drawable-large-hdpi-v11/address_bar_texture_tablet.png \
+  res/drawable-large-hdpi-v11/address_bar_back_button_bg.png \
+  res/drawable-large-hdpi-v11/address_bar_back_button_pressed_bg.png \
+  res/drawable-large-hdpi-v11/address_bar_url_default.9.png \
+  res/drawable-large-hdpi-v11/address_bar_url_pressed.9.png \
+  res/drawable-large-hdpi-v11/ic_awesomebar_go.png \
+  res/drawable-large-hdpi-v11/ic_awesomebar_search.png \
+  res/drawable-large-hdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-large-hdpi-v11/ic_menu_reload.png \
+  res/drawable-large-hdpi-v11/ic_menu_forward.png \
+  res/drawable-large-hdpi-v11/remote_tabs_off.png \
+  res/drawable-large-hdpi-v11/remote_tabs_on.png \
+  res/drawable-large-hdpi-v11/tab_new.png \
+  res/drawable-large-hdpi-v11/urlbar_stop.png \
+  res/drawable-large-hdpi-v11/reader.png \
+  res/drawable-large-hdpi-v11/site_security_identified.png \
+  res/drawable-large-hdpi-v11/site_security_verified.png \
+  res/drawable-large-hdpi-v11/menu.png \
+  res/drawable-large-hdpi-v11/tabs_carat.png \
+  res/drawable-large-hdpi-v11/tabs_crop_normal.png \
+  res/drawable-large-hdpi-v11/tabs_crop_pressed.png \
+  $(NULL)
+
+RES_DRAWABLE_LARGE_XHDPI_V11 = \
+  res/drawable-large-xhdpi-v11/address_bar_bg_curve.png \
+  res/drawable-large-xhdpi-v11/address_bar_texture_tablet.png \
+  res/drawable-large-xhdpi-v11/address_bar_back_button_bg.png \
+  res/drawable-large-xhdpi-v11/address_bar_back_button_pressed_bg.png \
+  res/drawable-large-xhdpi-v11/address_bar_url_default.9.png \
+  res/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png \
+  res/drawable-large-xhdpi-v11/ic_awesomebar_go.png \
+  res/drawable-large-xhdpi-v11/ic_awesomebar_search.png \
+  res/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-large-xhdpi-v11/ic_menu_reload.png \
+  res/drawable-large-xhdpi-v11/ic_menu_forward.png \
+  res/drawable-large-xhdpi-v11/remote_tabs_on.png \
+  res/drawable-large-xhdpi-v11/remote_tabs_off.png \
+  res/drawable-large-xhdpi-v11/tab_new.png \
+  res/drawable-large-xhdpi-v11/urlbar_stop.png \
+  res/drawable-large-xhdpi-v11/reader.png \
+  res/drawable-large-xhdpi-v11/site_security_identified.png \
+  res/drawable-large-xhdpi-v11/site_security_verified.png \
+  res/drawable-large-xhdpi-v11/menu.png \
+  res/drawable-large-xhdpi-v11/tabs_carat.png \
+  res/drawable-large-xhdpi-v11/tabs_crop_normal.png \
+  res/drawable-large-xhdpi-v11/tabs_crop_pressed.png \
+  $(NULL)
+
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
-  res/drawable-xlarge-mdpi-v11/address_bar_bg.xml \
-  res/drawable-xlarge-mdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-xlarge-mdpi-v11/address_bar_back_button_bg.png \
-  res/drawable-xlarge-mdpi-v11/address_bar_back_button_pressed_bg.png \
-  res/drawable-xlarge-mdpi-v11/address_bar_url_default.9.png \
-  res/drawable-xlarge-mdpi-v11/address_bar_url_pressed.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png \
   res/drawable-xlarge-mdpi-v11/menu.png \
-  res/drawable-xlarge-mdpi-v11/ic_awesomebar_go.png \
-  res/drawable-xlarge-mdpi-v11/ic_awesomebar_search.png \
-  res/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png \
-  res/drawable-xlarge-mdpi-v11/ic_menu_reload.png \
-  res/drawable-xlarge-mdpi-v11/ic_menu_forward.png \
-  res/drawable-xlarge-mdpi-v11/remote_tabs_off.png \
-  res/drawable-xlarge-mdpi-v11/remote_tabs_on.png \
-  res/drawable-xlarge-mdpi-v11/tab_new.png \
   res/drawable-xlarge-mdpi-v11/tabs_crop_button.xml \
   res/drawable-xlarge-mdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-mdpi-v11/tabs_carat_expanded.png \
@@ -788,72 +861,32 @@ RES_DRAWABLE_XLARGE_MDPI_V11 = \
   res/drawable-xlarge-mdpi-v11/tabs_level.xml \
   res/drawable-xlarge-mdpi-v11/tabs_crop_normal.png \
   res/drawable-xlarge-mdpi-v11/tabs_crop_pressed.png \
-  res/drawable-xlarge-mdpi-v11/urlbar_stop.png \
-  res/drawable-xlarge-mdpi-v11/reader.png \
-  res/drawable-xlarge-mdpi-v11/site_security_identified.png \
-  res/drawable-xlarge-mdpi-v11/site_security_verified.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_HDPI_V11 = \
-  res/drawable-xlarge-hdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-xlarge-hdpi-v11/address_bar_back_button_bg.png \
-  res/drawable-xlarge-hdpi-v11/address_bar_back_button_pressed_bg.png \
-  res/drawable-xlarge-hdpi-v11/address_bar_url_default.9.png \
-  res/drawable-xlarge-hdpi-v11/address_bar_url_pressed.9.png \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png \
   res/drawable-xlarge-hdpi-v11/menu.png \
-  res/drawable-xlarge-hdpi-v11/ic_awesomebar_go.png \
-  res/drawable-xlarge-hdpi-v11/ic_awesomebar_search.png \
-  res/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png \
-  res/drawable-xlarge-hdpi-v11/ic_menu_reload.png \
-  res/drawable-xlarge-hdpi-v11/ic_menu_forward.png \
-  res/drawable-xlarge-hdpi-v11/remote_tabs_off.png \
-  res/drawable-xlarge-hdpi-v11/remote_tabs_on.png \
-  res/drawable-xlarge-hdpi-v11/tab_new.png \
   res/drawable-xlarge-hdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-hdpi-v11/tabs_carat_expanded.png \
   res/drawable-xlarge-hdpi-v11/tabs_crop_expanded_normal.png \
   res/drawable-xlarge-hdpi-v11/tabs_crop_expanded_pressed.png \
   res/drawable-xlarge-hdpi-v11/tabs_crop_normal.png \
   res/drawable-xlarge-hdpi-v11/tabs_crop_pressed.png \
-  res/drawable-xlarge-hdpi-v11/urlbar_stop.png \
-  res/drawable-xlarge-hdpi-v11/reader.png \
-  res/drawable-xlarge-hdpi-v11/site_security_identified.png \
-  res/drawable-xlarge-hdpi-v11/site_security_verified.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_XHDPI_V11 = \
-  res/drawable-xlarge-xhdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-xlarge-xhdpi-v11/address_bar_back_button_bg.png \
-  res/drawable-xlarge-xhdpi-v11/address_bar_back_button_pressed_bg.png \
-  res/drawable-xlarge-xhdpi-v11/address_bar_url_default.9.png \
-  res/drawable-xlarge-xhdpi-v11/address_bar_url_pressed.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png \
   res/drawable-xlarge-xhdpi-v11/menu.png \
-  res/drawable-xlarge-xhdpi-v11/ic_awesomebar_go.png \
-  res/drawable-xlarge-xhdpi-v11/ic_awesomebar_search.png \
-  res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png \
-  res/drawable-xlarge-xhdpi-v11/ic_menu_reload.png \
-  res/drawable-xlarge-xhdpi-v11/ic_menu_forward.png \
-  res/drawable-xlarge-xhdpi-v11/remote_tabs_off.png \
-  res/drawable-xlarge-xhdpi-v11/tab_new.png \
-  res/drawable-xlarge-xhdpi-v11/remote_tabs_on.png \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_expanded.png \
   res/drawable-xlarge-xhdpi-v11/tabs_crop_expanded_normal.png \
   res/drawable-xlarge-xhdpi-v11/tabs_crop_expanded_pressed.png \
   res/drawable-xlarge-xhdpi-v11/tabs_crop_normal.png \
   res/drawable-xlarge-xhdpi-v11/tabs_crop_pressed.png \
-  res/drawable-xlarge-xhdpi-v11/urlbar_stop.png \
-  res/drawable-xlarge-xhdpi-v11/reader.png \
-  res/drawable-xlarge-xhdpi-v11/site_security_identified.png \
-  res/drawable-xlarge-xhdpi-v11/site_security_verified.png \
   $(NULL)
 
 RES_COLOR = \
@@ -924,14 +957,16 @@ MOZ_ANDROID_DRAWABLES += \
 
 MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 
-RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_XLARGE_V11) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
+RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
 
 RES_DIRS= \
   res/layout              \
   res/layout-land-v14     \
+  res/layout-large-v11    \
   res/layout-xlarge-v11   \
   res/values              \
   res/values-v11          \
+  res/values-large-v11    \
   res/values-xlarge-v11   \
   res/values-land-v14     \
   res/xml                 \
@@ -949,12 +984,16 @@ RES_DIRS= \
   res/drawable-land-mdpi-v14    \
   res/drawable-land-hdpi-v14    \
   res/drawable-land-xhdpi-v14   \
+  res/drawable-large-mdpi-v11   \
+  res/drawable-large-hdpi-v11   \
+  res/drawable-large-xhdpi-v11  \
   res/drawable-xlarge-mdpi-v11  \
   res/drawable-xlarge-hdpi-v11  \
   res/drawable-xlarge-xhdpi-v11 \
   res/color                     \
   res/menu                      \
   res/menu-v11                  \
+  res/menu-large-v11            \
   res/menu-xlarge-v11           \
   $(NULL)
 

mobile/android/base/TabsPanel.java

@@ -6,6 +6,7 @@
 package org.mozilla.gecko;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
@@ -47,6 +48,7 @@ public class TabsPanel extends LinearLayout {
     private TextView mTitle;
 
     private Panel mCurrentPanel;
+    private boolean mIsSideBar;
     private boolean mVisible;
 
     private static final int REMOTE_TABS_HIDDEN = 1;
@@ -62,6 +64,10 @@ public class TabsPanel extends LinearLayout {
         mCurrentPanel = Panel.LOCAL_TABS;
         mVisible = false;
 
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TabsPanel);
+        mIsSideBar = a.getBoolean(R.styleable.TabsPanel_sidebar, false);
+        a.recycle();
+
         mToolbar = (TabsPanelToolbar) findViewById(R.id.toolbar);
         mListContainer = (TabsListContainer) findViewById(R.id.list_container);
 
@@ -97,7 +103,7 @@ public class TabsPanel extends LinearLayout {
 
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            if (!GeckoApp.mAppContext.isTablet()) {
+            if (!GeckoApp.mAppContext.hasTabsSideBar()) {
                 DisplayMetrics metrics = new DisplayMetrics();
                 GeckoApp.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
@@ -120,7 +126,7 @@ public class TabsPanel extends LinearLayout {
 
             int panelToolbarRes;
 
-            if (GeckoApp.mAppContext.hasPermanentMenuKey())
+            if (!GeckoApp.mAppContext.hasPermanentMenuKey())
                 panelToolbarRes = R.layout.tabs_panel_toolbar_menu;
             else
                 panelToolbarRes = R.layout.tabs_panel_toolbar;
@@ -153,7 +159,7 @@ public class TabsPanel extends LinearLayout {
         mPanel.show();
         mListContainer.addView(mPanel.getLayout());
 
-        if (GeckoApp.mAppContext.isTablet()) {
+        if (GeckoApp.mAppContext.hasTabsSideBar()) {
             dispatchLayoutChange(getWidth(), getHeight());
         } else {
             int actionBarHeight = (int) (mContext.getResources().getDimension(R.dimen.browser_toolbar_height));
@@ -213,6 +219,10 @@ public class TabsPanel extends LinearLayout {
         return mVisible;
     }
 
+    public boolean isSideBar() {
+        return mIsSideBar;
+    }
+
     public void setTabsLayoutChangeListener(TabsLayoutChangeListener listener) {
         mLayoutChangeListener = listener;
     }

mobile/android/base/WebApp.java.in

@@ -23,6 +23,9 @@ public class WebApp extends GeckoApp {
     @Override
     public int getLayout() { return R.layout.web_app; }
 
+    @Override
+    public boolean hasTabsSideBar() { return false; }
+
     @Override
     public void onCreate(Bundle savedInstanceState)
     {

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                style="@style/AwesomeBar"
+                android:background="@drawable/address_bar_bg">
+
+    <view class="org.mozilla.gecko.CustomEditText"
+          android:id="@+id/awesomebar_text"
+          style="@style/AddressBar.Button"
+          android:background="@drawable/address_bar_url"
+          android:layout_margin="6dip"
+          android:layout_alignParentBottom="true"
+          android:layout_centerVertical="true"
+          android:paddingLeft="15dip"
+          android:paddingRight="40dip"
+          android:hint="@string/awesomebar_default_text"
+          android:textColorHighlight="@color/url_bar_text_highlight"
+          android:inputType="textUri|textNoSuggestions"
+          android:imeOptions="actionSearch|flagNoExtractUi|flagNoFullscreen"
+          android:selectAllOnFocus="true"
+          android:singleLine="true"
+          android:gravity="center_vertical|left">
+              <requestFocus/>
+    </view>
+
+    <LinearLayout android:layout_width="4dp"
+                  android:layout_height="fill_parent"
+                  android:orientation="vertical"
+                  android:layout_alignParentRight="true"/>
+
+    <ImageButton android:id="@+id/awesomebar_button"
+                 style="@style/AddressBar.ImageButton.Icon"
+                 android:padding="14dip"
+                 android:layout_centerVertical="true"
+                 android:layout_alignRight="@id/awesomebar_text"
+                 android:visibility="gone"
+                 android:src="@drawable/ic_awesomebar_go"/>
+
+</RelativeLayout>

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

@@ -8,45 +8,69 @@
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
-                    style="@style/AddressBar"
-                    android:background="@drawable/address_bar_bg">
+                    style="@style/AddressBar">
+
+        <View android:id="@+id/curve"
+              android:layout_width="84dip"
+              android:layout_height="fill_parent"
+              android:layout_marginRight="50dip"
+              android:layout_alignParentRight="true"
+              android:background="@drawable/address_bar_bg_curve"/>
+
+        <View android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_alignParentLeft="true"
+              android:layout_alignParentBottom="true"
+              android:layout_toLeftOf="@id/curve"
+              android:background="@drawable/address_bar_bg"/>
+
+        <ImageButton android:id="@+id/menu"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="90dip"
+                     android:layout_alignParentRight="true"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu_level"
+                     android:contentDescription="@string/menu"
+                     android:background="@drawable/menu_button"
+                     android:paddingLeft="48dip"
+                     android:paddingRight="14dip"
+                     android:visibility="gone"/>
 
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
-                     android:layout_width="84dip"
-                     android:layout_alignParentLeft="true"
-                     android:background="@drawable/tabs_crop_button"
+                     android:layout_width="112dip"
+                     android:layout_marginRight="22dip"
+                     android:layout_alignParentRight="true"
+                     android:background="@drawable/tabs_full_button"
                      android:gravity="center_vertical"
                      android:src="@drawable/tabs_level"
-                     android:paddingLeft="6dip"
-                     android:paddingRight="32dip"/>
+                     android:paddingLeft="42dip"
+                     android:paddingRight="42dip"/>
 
         <TextSwitcher android:id="@+id/tabs_count"
                      style="@style/AddressBar.ImageButton"
-                     android:layout_width="52dip"
+                     android:layout_width="112dip"
                      android:layout_height="wrap_content"
-                     android:layout_marginTop="8dp"
-                     android:layout_alignLeft="@id/tabs"
+                     android:layout_marginTop="6dp"
+                     android:layout_alignRight="@id/tabs"
                      android:gravity="center_horizontal"/>
 
-        <ImageButton android:id="@+id/menu"
-                     style="@style/AddressBar.ImageButton.Unused"/>
-
         <LinearLayout android:id="@+id/menu_items"
                       android:layout_width="wrap_content"
                       android:layout_height="fill_parent"
                       android:orientation="horizontal"
+                      android:layout_marginRight="110dip"
                       android:layout_alignParentRight="true"/>
         
         <Button android:id="@+id/awesome_bar"
                 style="@style/AddressBar.Button"
                 android:layout_width="fill_parent"
-                android:layout_marginLeft="0dp"
+                android:layout_marginLeft="26dp"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_toRightOf="@id/tabs"
+                android:layout_marginRight="0dp"
                 android:layout_toLeftOf="@id/menu_items"
+                android:layout_alignParentLeft="true"
                 android:layout_alignParentBottom="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/address_bar_url"
@@ -63,7 +87,7 @@
                      android:layout_height="40dip"
                      android:layout_centerVertical="true"
                      android:layout_alignLeft="@id/awesome_bar"
-                     android:paddingLeft="22dp"
+                     android:paddingLeft="26dp"
                      android:src="@drawable/ic_menu_forward"
                      android:contentDescription="@string/forward"
                      android:background="@drawable/address_bar_forward_button"/>
@@ -72,9 +96,9 @@
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="50dip"
                      android:layout_height="50dip"
+                     android:layout_marginLeft="6dp"
                      android:layout_centerVertical="true"
-                     android:layout_marginLeft="-28dp"
-                     android:layout_alignLeft="@id/awesome_bar"
+                     android:layout_alignParentLeft="true"
                      android:src="@drawable/ic_menu_back"
                      android:contentDescription="@string/back"
                      android:background="@drawable/address_bar_back_button"/>
@@ -90,27 +114,31 @@
 
         <LinearLayout android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
+                      android:layout_marginRight="10dip"
                       android:layout_centerVertical="true"
                       android:layout_alignRight="@id/awesome_bar"
                       android:orientation="horizontal">
 
             <ImageButton android:id="@+id/reader"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="14dip"
+                         style="@style/AddressBar.ImageButton"
+                         android:layout_width="24dip"
+                         android:layout_height="24dip"
                          android:src="@drawable/reader"
                          android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="14dip"
+                         style="@style/AddressBar.ImageButton"
+                         android:layout_width="24dip"
+                         android:layout_height="24dip"
                          android:src="@drawable/site_security_level"
                          android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="14dip"
+                         style="@style/AddressBar.ImageButton"
+                         android:layout_width="24dip"
+                         android:layout_height="24dip"
                          android:src="@drawable/urlbar_stop"
                          android:contentDescription="@string/stop"
                          android:visibility="gone"/>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+        <ImageButton android:id="@+id/menu"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="90dip"
+                     android:layout_alignParentRight="true"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu"
+                     android:contentDescription="@string/menu"
+                     android:background="@drawable/menu_normal"
+                     android:paddingLeft="48dip"
+                     android:paddingRight="14dip"
+                     android:enabled="false"/>
+
+        <View android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@drawable/tabs_tray_bg_repeat"
+              android:layout_marginRight="110dip"/>
+
+        <LinearLayout android:layout_width="fill_parent"
+                      android:layout_height="fill_parent"
+                      android:layout_marginRight="12dip">
+
+            <TextView android:id="@+id/title"
+                      android:layout_width="wrap_content"
+                      android:layout_height="fill_parent"
+                      android:layout_weight="1.0"
+                      style="@style/TabRowTextAppearance"
+                      android:gravity="center_vertical"
+                      android:padding="10dip"
+                      android:textSize="16sp"/>
+
+            <ImageButton android:id="@+id/remote_tabs"
+                         android:layout_width="@dimen/browser_toolbar_height"
+                         android:layout_height="@dimen/browser_toolbar_height"
+                         android:gravity="center_vertical"
+                         android:padding="12dip"
+                         android:src="@drawable/remote_tabs_level"
+                         android:contentDescription="@string/remote_tabs"
+                         android:background="@drawable/action_bar_button"
+                         android:visibility="gone"/>
+
+            <ImageButton android:id="@+id/add_tab"
+                         android:layout_width="98dip"
+                         android:layout_height="@dimen/browser_toolbar_height"
+                         android:gravity="center_vertical"
+                         android:paddingLeft="14dip"
+                         android:paddingRight="56dip"
+                         android:src="@drawable/tab_new"
+                         android:contentDescription="@string/new_tab"
+                         android:background="@drawable/tab_new_button"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</merge>

mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in

@@ -1,16 +1,19 @@
+#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
 
    <org.mozilla.gecko.TabsPanel android:id="@+id/tabs_panel"
                                 android:layout_width="200dip"
                                 android:layout_height="fill_parent"
-                                android:background="@drawable/tabs_tray_bg_repeat"/>
+                                android:background="@drawable/tabs_tray_bg_repeat"
+                                gecko:sidebar="true"/>
 
    <LinearLayout android:id="@+id/main_layout"
                  style="@style/Screen.Transparent">