nav mods
Change-Id: I80afd61d8d85b39fdeefacb1303294a33f696b75
diff --git a/res/drawable-hdpi/nav_tab_bg.9.png b/res/drawable-hdpi/nav_tab_bg.9.png
deleted file mode 100644
index 2578e4a..0000000
--- a/res/drawable-hdpi/nav_tab_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/nav_tab_bg.9.png b/res/drawable-mdpi/nav_tab_bg.9.png
deleted file mode 100644
index 2578e4a..0000000
--- a/res/drawable-mdpi/nav_tab_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/nav_screen_bg.xml b/res/drawable/nav_screen_bg.xml
new file mode 100644
index 0000000..7ca4e78
--- /dev/null
+++ b/res/drawable/nav_screen_bg.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:type="linear"
+ android:startColor="#ff000000"
+ android:centerColor="#ff808080"
+ android:endColor="#ff000000"
+ android:centerY="0.2"
+ android:angle="90" />
+</shape>
diff --git a/res/drawable/nav_tab_bg.9.png b/res/drawable/nav_tab_bg.9.png
new file mode 100644
index 0000000..9e0a23d
--- /dev/null
+++ b/res/drawable/nav_tab_bg.9.png
Binary files differ
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index e4eb800..cf2e144 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -18,49 +18,50 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/nav_screen"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:background="@drawable/nav_screen_bg" >
<LinearLayout
android:id="@+id/tabbar"
- android:orientation="vertical"
- android:layout_width="44dip"
- android:layout_height="match_parent"
- android:layout_alignParentRight="true"
- android:background="#80404040">
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="44dip"
+ android:layout_alignParentBottom="true"
+ android:background="#C0404040">
<ImageButton
android:id="@+id/newtab"
- android:layout_height="0dip"
+ android:layout_width="0dip"
android:layout_weight="0.25"
- android:layout_width="match_parent"
+ android:layout_height="match_parent"
style="@style/HoloButton"
android:gravity="center_vertical"
android:src="@drawable/ic_new_window_holo_dark" />
<ImageButton
android:id="@+id/newincognito"
- android:layout_height="0dip"
+ android:layout_width="0dip"
android:layout_weight="0.25"
- android:layout_width="match_parent"
+ android:layout_height="match_parent"
style="@style/HoloButton"
android:gravity="center_vertical"
android:src="@drawable/ic_new_incognito_holo_dark" />
<ImageButton
android:id="@+id/bookmarks"
- android:layout_height="0dip"
+ android:layout_width="0dip"
android:layout_weight="0.25"
- android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:src="@drawable/ic_bookmarks_history_holo_dark"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/more"
- android:layout_height="0dip"
+ android:layout_width="0dip"
android:layout_weight="0.25"
- android:layout_width="match_parent"
+ android:layout_height="match_parent"
style="@style/HoloButton"
android:gravity="center_vertical"
android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
</LinearLayout>
- <com.android.browser.NavTabScroller
+ <com.android.browser.NavTabGallery
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_toLeftOf="@id/tabbar" />
+ android:layout_above="@id/tabbar" />
</RelativeLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 667bf08..fee45b1 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -19,14 +19,19 @@
android:id="@+id/nav_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="@drawable/nav_screen_bg">
+ <com.android.browser.NavTabGallery
+ android:id="@+id/scroller"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" />
<LinearLayout
android:id="@+id/tabbar"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="44dip"
- android:layout_alignParentBottom="true"
- android:background="#80404040">
+ android:background="#C0404040">
<ImageButton
android:id="@+id/newtab"
android:layout_width="0dip"
@@ -59,9 +64,4 @@
android:gravity="center_vertical"
android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
</LinearLayout>
- <com.android.browser.NavTabScroller
- android:id="@+id/scroller"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_above="@id/tabbar" />
</RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 5a71c71..543c26e 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -19,27 +19,17 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
android:orientation="vertical"
+ android:background="@drawable/nav_tab_bg"
android:focusable="false">
<LinearLayout
android:id="@+id/titlebar"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height"
+ android:layout_height="48dip"
android:layout_gravity="center_horizontal"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
- android:paddingTop="2dip"
- android:paddingBottom="2dip">
- <ImageView
- android:id="@+id/favicon"
- android:layout_width="20dip"
- android:layout_height="20dip"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="4dip"
- android:layout_gravity="center_vertical" />
+ android:paddingLeft="32dip"
+ android:paddingRight="24dip">
<TextView
android:id="@+id/title"
android:layout_width="0dip"
@@ -49,37 +39,20 @@
android:singleLine="true"
android:ellipsize="end"
android:lines="1"
- android:background="@*android:drawable/edit_text_holo_dark"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:scrollHorizontally="true"
- android:hint="@string/search_hint" />
- <ImageButton
- android:id="@+id/refresh"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:scrollHorizontally="true" />
+ <ImageView
+ android:id="@+id/closetab"
+ android:src="@drawable/ic_stop_holo_dark"
+ android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_refresh_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/forward"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/ic_forward_holo_dark"
- style="@style/HoloButton" />
+ android:layout_height="wrap_content" />
</LinearLayout>
<FrameLayout
android:id="@+id/tab_view"
android:layout_width="@dimen/nav_tab_width"
android:layout_height="@dimen/nav_tab_height"
android:layout_gravity="center_horizontal"
- android:padding="4dip"
- android:focusable="false"
- android:background="@drawable/nav_tab_bg">
- <ImageButton
- android:id="@+id/closetab"
- android:src="@drawable/ic_stop_holo_dark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|right"
- android:background="@drawable/navtab_close_background" />
+ android:focusable="false">
</FrameLayout>
</LinearLayout>
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index df4bc84..01491c3 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -15,6 +15,6 @@
<dimen name="preference_screen_side_margin">96dp</dimen>
<dimen name="preference_screen_side_margin_negative">-100dp</dimen>
<dimen name="preference_widget_width">72dp</dimen>
- <dimen name="nav_tab_width">280dip</dimen>
- <dimen name="nav_tab_height">240dip</dimen>
+ <dimen name="nav_tab_width">180dip</dimen>
+ <dimen name="nav_tab_height">180dip</dimen>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 950de5b..355c1cf 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -67,8 +67,8 @@
<dimen name="menu_width">240dip</dimen>
<dimen name="toolbar_height">52dip</dimen>
<dimen name="tab_capture_size">160dp</dimen>
- <dimen name="nav_tab_width">280dip</dimen>
- <dimen name="nav_tab_height">280dip</dimen>
+ <dimen name="nav_tab_width">240dip</dimen>
+ <dimen name="nav_tab_height">240dip</dimen>
<dimen name="nav_tab_text_normal">18sp</dimen>
<dimen name="nav_tab_text_small">14sp</dimen>
</resources>
