commit ed217745066c160f785626e9a15ebe70af5e25e4
author Michael Kolb <kolby@google.com> Tue Aug 10 17:52:34 2010 -0700
committer Michael Kolb <kolby@google.com> Fri Aug 13 10:29:05 2010 -0700
tree 963a7f797a48b40d2f57d43288f918e25d157c3f
parent 8b139744c1138351fb8e3fff280cf45dd056fa85

switched to using action bar for large screen

Change-Id: I33b6bcd78d4983e0ce1b503d3756687588dd8ed0

res/layout/tab_bar.xml

diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 60f08ef..0b3fae1 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -15,28 +15,20 @@
     android:id="@+id/tabbarcontent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#ffdddddd"
+    style="@style/ActionBarStyle"
     android:orientation="horizontal">
-    <com.android.browser.TabScrollView
-        android:id="@+id/tabs"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0"
-        android:orientation="horizontal" />
     <ImageButton
         android:id="@+id/showurl"
         android:src="@drawable/ic_menu_showurl"
         android:layout_width="48dip"
         android:layout_height="48dip"
-        android:layout_marginLeft="6dip"
+        android:layout_marginLeft="3dip"
         android:background="@drawable/browserbarbutton"
-        android:visibility="invisible" />
-    <ImageButton
-        android:id="@+id/newtab"
-        android:src="@drawable/ic_menu_new_window"
-        android:layout_width="48dip"
+        android:visibility="gone" />
+    <com.android.browser.TabScrollView
+        android:id="@+id/tabs"
+        android:layout_width="0dp"
         android:layout_height="48dip"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
-        android:background="@drawable/browserbarbutton" />
+        android:layout_weight="1.0"
+        android:orientation="horizontal" />
 </LinearLayout>

res/layout/tab_title.xml

diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 6166d24..9fdddeb 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -10,7 +10,7 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<LinearLayout
+<merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="0dip"
     android:layout_weight="1.0"
@@ -46,4 +46,4 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="6dip"
         android:src="@drawable/btn_close_window" />
-</LinearLayout>
+</merge>

res/layout/url_bar.xml

diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 9bf617d..a8e5a8d 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -96,14 +96,6 @@
                 android:background="@drawable/browserbarbutton" />
         </LinearLayout>
         <ImageButton
-            android:id="@+id/menu"
-            android:src="@drawable/ic_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="6dip"
-            android:layout_marginRight="6dip"
-            android:background="@drawable/browserbarbutton" />
-        <ImageButton
             android:id="@+id/all_btn"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"