diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/nav_screen.xml | 16 | ||||
| -rw-r--r-- | res/layout/nav_tab_view.xml | 51 |
2 files changed, 20 insertions, 47 deletions
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: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: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_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> |