Merge "long axis scrolling for nav screen"

5 files changed, 13 insertions, 27 deletions

diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index 846b809..e4eb800 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -20,17 +20,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
     <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="vertical"
         android:layout_width="44dip"
         android:layout_height="match_parent"
-        android:layout_below="@id/titlebar"
         android:layout_alignParentRight="true"
         android:background="#80404040">
         <ImageButton
@@ -69,7 +62,5 @@
         android:id="@+id/scroller"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_toLeftOf="@id/tabbar"
-        android:paddingTop="0dp"
-        android:paddingBottom="10dp" />
+        android:layout_toLeftOf="@id/tabbar" />
 </RelativeLayout>
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>
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index cd8fbaf..e69bd82 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -15,6 +15,7 @@
     <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">300dip</dimen>
-    <dimen name="nav_tab_height">300dip</dimen>
+    <dimen name="nav_tab_width">280dip</dimen>
+    <dimen name="nav_tab_height">240dip</dimen>
+    <dimen name="nav_scroller_padding">101dip</dimen>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 10ed66e..e1ae0eb 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -68,8 +68,8 @@
     <dimen name="nav_tab_spacing">8dp</dimen>
     <dimen name="menu_width">240dip</dimen>
     <dimen name="toolbar_height">52dip</dimen>
-    <dimen name="tab_capture_size">480dp</dimen>
+    <dimen name="tab_capture_size">160dp</dimen>
     <dimen name="nav_tab_width">280dip</dimen>
-    <dimen name="nav_tab_height">400dip</dimen>
-    <dimen name="nav_scroller_padding">40dip</dimen>
+    <dimen name="nav_tab_height">280dip</dimen>
+    <dimen name="nav_scroller_padding">68dip</dimen>
 </resources>