move new tab button next to tabs

     http://b/issue?id=3052018
     moved tab button
     added new tab option to menu
     http://b/issue?id=3052583
     changed text from window to tab

Change-Id: I079636f29ea529915a5f8c3ad55b4b4c7afe579f

3 files changed, 39 insertions, 7 deletions

diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 7967307..2726055 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -10,17 +10,24 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<LinearLayout
+<merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabbarcontent"
     android:layout_width="match_parent"
     android:layout_height="48dip"
+    android:orientation="horizontal"
     style="@style/ActionBarStyle"
-    android:orientation="horizontal">
+    >
     <com.android.browser.TabScrollView
         android:id="@+id/tabs"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="1.0"
         android:orientation="horizontal" />
-</LinearLayout>
+    <ImageButton
+        android:id="@+id/newtab"
+        android:src="@drawable/ic_menu_new_window"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        style="@style/HoloButton"
+        android:background="@drawable/browserbarbutton" />
+</merge>
\ No newline at end of file
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index cf29351..3b93835 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -19,10 +19,10 @@
         <item android:id="@+id/newtab"
             android:icon="@drawable/ic_menu_new_window"
             android:title="@string/new_tab"
-            android:showAsAction="always"
+            android:showAsAction="never"
             android:alphabeticShortcut="n" />
         <item android:id="@+id/incognito_menu_id"
-            android:title="@string/incognito_tab"
+            android:title="@string/new_incognito_tab"
             android:icon="@drawable/ic_menu_incognito_normal" />
         <item android:id="@+id/find_menu_id"
             android:title="@*android:string/find_on_page"
diff --git a/res/values-xlarge/strings.xml b/res/values-xlarge/strings.xml
new file mode 100644
index 0000000..07b2b34
--- /dev/null
+++ b/res/values-xlarge/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Name of menu item of a new tab.
+         Also used in the title bar when displaying a new tab [CHAR LIMIT=30] -->
+    <string name="new_tab">New tab</string>
+    <!-- Name of menu item of a new incognito tab.  Also used in the
+         title bar when displaying a new tab [CHAR LIMIT=30] -->
+    <string name="new_incognito_tab">New incognito tab</string>
+    <!-- Name of menu item which brings up a list of the currently active tabs -->
+    <string name="active_tabs">Tabs</string>
+</resources>