diff options
| author | Michael Kolb <kolby@google.com> | 2011-05-19 15:49:41 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-05-25 15:17:50 -0700 |
| commit | 2814a362c21ac219410d9b54e1bd3e8152b845c7 (patch) | |
| tree | e151c7b93ebd686c6136d1a630410ecc4cd445d9 /res/layout/nav_screen.xml | |
| parent | 45377778b556064718b61c9495ae5bdc900fd996 (diff) | |
| download | packages_apps_Browser-2814a362c21ac219410d9b54e1bd3e8152b845c7.zip packages_apps_Browser-2814a362c21ac219410d9b54e1bd3e8152b845c7.tar.gz packages_apps_Browser-2814a362c21ac219410d9b54e1bd3e8152b845c7.tar.bz2 | |
new iteration of the navigation UI
use live webviews
Change-Id: Ie787c76470e445548d358374f83f33a1b0b0b5cf
Diffstat (limited to 'res/layout/nav_screen.xml')
| -rw-r--r-- | res/layout/nav_screen.xml | 68 |
1 files changed, 20 insertions, 48 deletions
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> |