adjust tabs in nav screen

Change-Id: Iaf34ae0d1e143508cb109c96612ba539ad7dd31b

4 files changed, 29 insertions, 19 deletions

diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index cf2e144..d2424ea 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -26,35 +26,40 @@
         android:layout_width="match_parent"
         android:layout_height="44dip"
         android:layout_alignParentBottom="true"
+        android:gravity="right"
         android:background="#C0404040">
         <ImageButton
             android:id="@+id/newtab"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@drawable/ic_new_window_holo_dark" />
         <ImageButton
             android:id="@+id/newincognito"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@drawable/ic_new_incognito_holo_dark" />
         <ImageButton
             android:id="@+id/bookmarks"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             android:src="@drawable/ic_bookmarks_history_holo_dark"
             style="@style/HoloButton" />
         <ImageButton
             android:id="@+id/more"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index fee45b1..b4e1f15 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -31,35 +31,40 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="44dip"
+        android:gravity="right"
         android:background="#C0404040">
         <ImageButton
             android:id="@+id/newtab"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@drawable/ic_new_window_holo_dark" />
         <ImageButton
             android:id="@+id/newincognito"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@drawable/ic_new_incognito_holo_dark" />
         <ImageButton
             android:id="@+id/bookmarks"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             android:src="@drawable/ic_bookmarks_history_holo_dark"
             style="@style/HoloButton" />
         <ImageButton
             android:id="@+id/more"
-            android:layout_width="0dip"
-            android:layout_weight="0.25"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index 01491c3..5294d6e 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -15,6 +15,6 @@
     <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">180dip</dimen>
-    <dimen name="nav_tab_height">180dip</dimen>
+    <dimen name="nav_tab_width">225dip</dimen>
+    <dimen name="nav_tab_height">150dip</dimen>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 4f93914..c4ce151 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -68,7 +68,7 @@
     <dimen name="toolbar_height">52dip</dimen>
     <dimen name="tab_capture_size">160dp</dimen>
     <dimen name="nav_tab_width">240dip</dimen>
-    <dimen name="nav_tab_height">240dip</dimen>
+    <dimen name="nav_tab_height">160dip</dimen>
     <dimen name="nav_tab_text_normal">18sp</dimen>
     <dimen name="nav_tab_text_small">14sp</dimen>
     <dimen name="suggest_item_padding">8dp</dimen>