diff options
| author | Michael Kolb <kolby@google.com> | 2011-05-27 15:50:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-27 15:50:54 -0700 |
| commit | 9465f4db222d280118ecd9a45261a62389dda520 (patch) | |
| tree | 24c496fac3c955cae58a0a675a6cdb1d76db12ec /res/layout | |
| parent | ce4dbb68de9fe867d69b37f27e1d214381ecefca (diff) | |
| parent | 4bd767d2f4ce166a44687170c6af18e242447205 (diff) | |
| download | packages_apps_Browser-9465f4db222d280118ecd9a45261a62389dda520.zip packages_apps_Browser-9465f4db222d280118ecd9a45261a62389dda520.tar.gz packages_apps_Browser-9465f4db222d280118ecd9a45261a62389dda520.tar.bz2 | |
Merge "long axis scrolling for nav screen"
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/nav_screen.xml | 10 | ||||
| -rw-r--r-- | res/layout/nav_tab_view.xml | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml index 82f783b..667bf08 100644 --- a/res/layout/nav_screen.xml +++ b/res/layout/nav_screen.xml @@ -21,12 +21,6 @@ android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout - 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" @@ -69,7 +63,5 @@ android:id="@+id/scroller" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@id/tabbar" - android:paddingTop="0dp" - android:paddingBottom="10dp" /> + android:layout_above="@id/tabbar" /> </RelativeLayout> diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml index 5b9cb9f..7d9263d 100644 --- a/res/layout/nav_tab_view.xml +++ b/res/layout/nav_tab_view.xml @@ -17,8 +17,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/main" - android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:paddingLeft="4dp" android:paddingRight="4dp" android:orientation="vertical" @@ -28,6 +28,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" + android:layout_gravity="center_horizontal" android:paddingLeft="4dip" android:paddingRight="4dip" android:paddingTop="2dip" @@ -69,6 +70,7 @@ 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"> @@ -77,7 +79,7 @@ android:src="@drawable/ic_stop_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right|top" + android:layout_gravity="right|bottom" android:background="@drawable/navtab_close_background" /> </FrameLayout> </LinearLayout> |