Bug 1066546 - Part 1 - Inline header and footer layouts (r=lucasr)
authorMartyn Haigh <martyn.haigh@gmail.com>
Fri, 03 Oct 2014 15:49:19 +0100
changeset 208722 4a1cf6241e5fd1f7d8281a40089225a906aa2b7d
parent 208721 076790f9ebc2fae2619239cd157965fe90580643
child 208723 9f9ab384033475ccde26d520bd1c049a767c4ba7
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerslucasr
bugs1066546
milestone35.0a1
Bug 1066546 - Part 1 - Inline header and footer layouts (r=lucasr)
mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
mobile/android/base/resources/layout/tabs_panel.xml
mobile/android/base/resources/layout/tabs_panel_header.xml
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
@@ -10,17 +10,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_header"/>
+
+            <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                                    android:layout_width="wrap_content"
+                                                    android:layout_height="match_parent"
+                                                    android:tabStripEnabled="false"
+                                                    android:divider="@drawable/tab_indicator_divider"
+                                                    android:layout="@layout/tabs_panel_indicator"/>
+
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
               android:background="#1A000000"/>
 
@@ -59,17 +66,35 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_footer"/>
+            <ImageButton android:id="@+id/add_tab"
+                         android:layout_width="@dimen/browser_toolbar_height"
+                         android:layout_height="@dimen/browser_toolbar_height"
+                         android:padding="14dip"
+                         android:src="@drawable/tab_new_level"
+                         android:contentDescription="@string/new_tab"
+                         android:background="@drawable/action_bar_button_inverse"/>
+
+            <View android:layout_width="0dip"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1.0"/>
+
+            <ImageButton android:id="@+id/menu"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/menu_tabs"
+                         android:contentDescription="@string/menu"
+                         android:background="@drawable/action_bar_button_inverse"
+                         android:visibility="gone"/>
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentTop="true"
               android:background="#1A000000"/>
 
deleted file mode 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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">
-
-    <ImageButton android:id="@+id/add_tab"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
-                 android:padding="14dip"
-                 android:src="@drawable/tab_new_level"
-                 android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button_inverse"/>
-
-    <View android:layout_width="0dip"
-          android:layout_height="match_parent"
-          android:layout_weight="1.0"/>
-
-    <ImageButton android:id="@+id/menu"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/menu_tabs"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button_inverse"
-                 android:visibility="gone"/>
-
-</merge>
deleted file mode 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
-
-    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:tabStripEnabled="false"
-                                            android:divider="@drawable/tab_indicator_divider"
-                                            android:layout="@layout/tabs_panel_indicator"/>
-
-</merge>
--- a/mobile/android/base/resources/layout/tabs_panel.xml
+++ b/mobile/android/base/resources/layout/tabs_panel.xml
@@ -10,17 +10,41 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-            <include layout="@layout/tabs_panel_header"/>
+            <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                                    android:layout_width="wrap_content"
+                                                    android:layout_height="match_parent"
+                                                    android:tabStripEnabled="false"
+                                                    android:divider="@drawable/tab_indicator_divider"
+                                                    android:layout="@layout/tabs_panel_indicator"/>
+
+            <View android:layout_width="0dip"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1.0"/>
+
+            <ImageButton android:id="@+id/add_tab"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/tab_new_level"
+                         android:contentDescription="@string/new_tab"
+                         android:background="@drawable/action_bar_button_inverse"/>
+
+            <ImageButton android:id="@+id/menu"
+                         style="@style/UrlBar.ImageButton"
+                         android:padding="@dimen/browser_toolbar_button_padding"
+                         android:src="@drawable/menu_tabs"
+                         android:contentDescription="@string/menu"
+                         android:background="@drawable/action_bar_button_inverse"
+                         android:visibility="gone"/>
 
         </view>
 
         <View android:layout_width="match_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
               android:background="#1A000000"/>
 
deleted file mode 100644
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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">
-
-    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:tabStripEnabled="false"
-                                            android:divider="@drawable/tab_indicator_divider"
-                                            android:layout="@layout/tabs_panel_indicator"/>
-
-    <View android:layout_width="0dip"
-          android:layout_height="match_parent"
-          android:layout_weight="1.0"/>
-
-    <ImageButton android:id="@+id/add_tab"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/tab_new_level"
-                 android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button_inverse"/>
-
-    <ImageButton android:id="@+id/menu"
-                 style="@style/UrlBar.ImageButton"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/menu_tabs"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button_inverse"
-                 android:visibility="gone"/>
-
-</merge>