switched to using action bar for large screen
Change-Id: I33b6bcd78d4983e0ce1b503d3756687588dd8ed0
diff --git a/res/drawable/ic_menu_hideurl.png b/res/drawable/ic_menu_hideurl.png
new file mode 100644
index 0000000..571457b
--- /dev/null
+++ b/res/drawable/ic_menu_hideurl.png
Binary files differ
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>
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>
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"
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index 0fc20be..191f99f 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -16,14 +16,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/MAIN_MENU">
- <item android:id="@+id/new_tab_menu_id"
- android:title="@string/new_tab"
+ <item android:id="@+id/newtab"
android:icon="@drawable/ic_menu_new_window"
+ android:title="@string/new_tab"
+ android:showAsAction="always"
android:alphabeticShortcut="n" />
- <item android:id="@+id/active_tabs_menu_id"
- android:title="@string/active_tabs"
- android:icon="@drawable/ic_menu_windows"
- android:alphabeticShortcut="t" />
<item android:id="@+id/find_menu_id"
android:title="@string/find_dot"
android:icon="@drawable/ic_menu_find"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
new file mode 100644
index 0000000..844f54f
--- /dev/null
+++ b/res/values-xlarge/styles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ *
+ * Copyright 2006,2007,2008 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>
+ <style name="BrowserTheme" parent="@android:Theme.Black">
+ <item name="android:windowBackground">@color/white</item>
+ <item name="android:colorBackground">#FFFFFFFF</item>
+ <item name="android:windowActionBar">true</item>
+ <item name="android:windowNoTitle">false</item>
+ <item name="android:windowActionBarStyle">@style/ActionBarStyle</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="BookmarkTheme" parent="@android:Theme.Black">
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="ActionBarStyle">
+ <item name="android:background">#ffdddddd</item>
+ <item name="android:height">48dip</item>
+ <item name="android:padding">0dip</item>
+ <item name="android:displayOptions">hideHome</item>
+ </style>
+ <style name="TitleBar">
+ <item name="android:windowEnterAnimation">@anim/title_bar_enter</item>
+ <item name="android:windowExitAnimation">@anim/title_bar_exit</item>
+ </style>
+</resources>
+
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2e8510a..a339b57 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
+/*
*
* Copyright 2006,2007,2008 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
+ * 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
+ * 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
+ * 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.
*/
-->
