new iteration of the navigation UI
use live webviews
Change-Id: Ie787c76470e445548d358374f83f33a1b0b0b5cf
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 2170154..82f783b 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -14,16 +14,24 @@
limitations under the License.
-->
-<LinearLayout
+<RelativeLayout
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:orientation="vertical">
<LinearLayout
- android:id="@+id/navtop"
+ android:id="@+id/titlebar"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height"
+ android:background="@drawable/bg_urlbar" />
+ <LinearLayout
+ android:id="@+id/tabbar"
+ android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="44dip"
+ android:layout_alignParentBottom="true"
android:background="#80404040">
<ImageButton
android:id="@+id/newtab"
@@ -42,13 +50,12 @@
android:gravity="center_vertical"
android:src="@drawable/ic_new_incognito_holo_dark" />
<ImageButton
- android:id="@+id/tabs"
+ android:id="@+id/bookmarks"
android:layout_width="0dip"
android:layout_weight="0.25"
android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:src="@drawable/ic_windows_holo_dark" />
+ android:src="@drawable/ic_bookmarks_history_holo_dark"
+ style="@style/HoloButton" />
<ImageButton
android:id="@+id/more"
android:layout_width="0dip"
@@ -58,46 +65,11 @@
android:gravity="center_vertical"
android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
</LinearLayout>
- <FrameLayout
- android:id="@+id/galleryholder"
+ <com.android.browser.NavTabScroller
+ android:id="@+id/scroller"
android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:paddingTop="5dp"
- android:paddingBottom="5dp" />
- <LinearLayout
- android:id="@+id/navbar"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="44dip"
- android:background="#80404040">
- <ImageButton
- android:id="@+id/back"
- android:layout_width="0dip"
- android:layout_weight="0.25"
- android:layout_height="match_parent"
- android:src="@drawable/ic_back_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/refresh"
- android:layout_width="0dip"
- android:layout_weight="0.25"
- android:layout_height="match_parent"
- android:src="@drawable/ic_refresh_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/forward"
- android:layout_width="0dip"
- android:layout_weight="0.25"
- android:layout_height="match_parent"
- android:src="@drawable/ic_forward_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/bookmarks"
- android:layout_width="0dip"
- android:layout_weight="0.25"
- android:layout_height="match_parent"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
- style="@style/HoloButton" />
- </LinearLayout>
-</LinearLayout>
+ android:layout_height="match_parent"
+ android:layout_above="@id/tabbar"
+ android:paddingTop="0dp"
+ android:paddingBottom="10dp" />
+</RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index f657f4f..5b9cb9f 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -14,20 +14,24 @@
limitations under the License.
-->
-<com.android.browser.view.TabHolderView
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/tab_view"
+ android:id="@+id/main"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
android:orientation="vertical"
- android:padding="4dip"
- android:focusable="false"
- 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="@dimen/toolbar_height"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip">
<ImageView
android:id="@+id/favicon"
android:layout_width="20dip"
@@ -38,30 +42,42 @@
<TextView
android:id="@+id/title"
android:layout_width="0dip"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
- android:textSize="14dip"
- android:textColor="@color/white"
+ android:gravity="center_vertical"
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"
- android:layout_gravity="center_vertical" />
+ android:hint="@string/search_hint" />
+ <ImageButton
+ android:id="@+id/refresh"
+ 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" />
+ </LinearLayout>
+ <FrameLayout
+ android:id="@+id/tab_view"
+ android:layout_width="@dimen/nav_tab_width"
+ android:layout_height="@dimen/nav_tab_height"
+ 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="match_parent"
- android:layout_gravity="center_vertical"
- android:paddingLeft="4dip"
- android:background="@drawable/bookmark_thumb_selector"
- />
- </LinearLayout>
- <ImageView
- android:id="@+id/content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:adjustViewBounds="true"
- android:scaleType="fitXY" />
-</com.android.browser.view.TabHolderView>
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|top"
+ android:background="@drawable/navtab_close_background" />
+ </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index d00a56c..649a4a0 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -77,8 +77,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:src="@drawable/ic_stop_holo_dark"
- android:visibility="gone" />
+ android:src="@drawable/ic_stop_holo_dark" />
+ <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" />
</LinearLayout>
<LinearLayout
android:id="@+id/autologin"