Bug 1091107 - Visual refinements in the tab strip (r=mcomella)
--- a/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
+++ b/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
@@ -26,27 +26,27 @@
<shape>
<solid android:color="@color/highlight_dark_focused" />
</shape>
</item>
<item android:state_pressed="true"
android:state_checked="true">
<shape>
- <solid android:color="@color/highlight_nav" />
+ <solid android:color="@color/new_tablet_highlight" />
</shape>
</item>
<item android:state_checked="true">
<shape>
<solid android:color="@color/background_normal" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
- <solid android:color="@color/highlight_dark" />
+ <solid android:color="@color/new_tablet_highlight_dark" />
</shape>
</item>
<item android:drawable="@android:color/transparent"/>
</selector>
--- a/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
@@ -5,17 +5,16 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<org.mozilla.gecko.tabs.TabStripView
android:id="@+id/tab_strip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dp"
android:requiresFadingEdge="horizontal"
android:fadingEdgeLength="10dp"
android:paddingTop="8dp"/>
<ImageButton
android:id="@+id/add_tab"
style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/new_tablet_tab_strip_height"
--- a/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml
@@ -5,10 +5,10 @@
<!-- The paddings are asymmetric here to compensate the padding around the
the close button within the TabStripItemView -->
<org.mozilla.gecko.tabs.TabStripItemView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/new_tablet_tab_strip_item_width"
android:layout_height="match_parent"
android:background="@drawable/new_tablet_tab_strip_item_bg"
- android:paddingLeft="25dp"
- android:paddingRight="15dp"/>
+ android:paddingLeft="28dp"
+ android:paddingRight="12dp"/>
--- a/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
@@ -5,17 +5,17 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto">
<ImageView
android:id="@+id/favicon"
android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
android:layout_height="match_parent"
- android:layout_marginRight="9dp"
+ android:layout_marginRight="8dp"
android:scaleType="centerInside"
android:duplicateParentState="true"/>
<org.mozilla.gecko.widget.FadedTextView
android:id="@+id/title"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -13,16 +13,17 @@
<color name="highlight_dark">#33FFFFFF</color>
<color name="highlight_dark_focused">#1AFFFFFF</color>
<!-- (bug 1077195) Focused state values are temporary. -->
<color name="new_tablet_highlight">#D7D7DC</color>
<color name="new_tablet_highlight_focused">#C0C9D0</color>
<color name="new_tablet_highlight_pb">#222222</color>
<color name="new_tablet_highlight_focused_pb">#363B40</color>
+ <color name="new_tablet_highlight_dark">#45494E</color>
<!-- highlight on shaped button: 20% white over background_tabs -->
<color name="highlight_shaped">#FF696D71</color>
<!-- highlight-focused on shaped button: 10% white over background_tabs -->
<color name="highlight_shaped_focused">#FF565B60</color>
<!-- highlight on nav button: 20% black over background_normal -->
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -18,18 +18,18 @@
<dimen name="browser_toolbar_shadow_size">2dp</dimen>
<!-- If you update one of these values, update the others. -->
<dimen name="new_tablet_nav_button_width">42dp</dimen>
<dimen name="new_tablet_nav_button_width_half">21dp</dimen>
<dimen name="new_tablet_nav_button_width_plus_half">63dp</dimen>
<dimen name="new_tablet_tab_strip_height">48dp</dimen>
- <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
- <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
+ <dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
+ <dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
<dimen name="new_tablet_tab_strip_favicon_size">16dp</dimen>
<dimen name="new_tablet_site_security_height">60dp</dimen>
<dimen name="new_tablet_site_security_width">34dp</dimen>
<!-- We primarily use padding (instead of margins) to increase the hit area. -->
<dimen name="new_tablet_site_security_padding_vertical">21dp</dimen>
<dimen name="new_tablet_site_security_padding_horizontal">8dp</dimen>
<dimen name="new_tablet_site_security_right_margin">1dp</dimen>
<dimen name="new_tablet_browser_toolbar_height">60dp</dimen>