Bug 1391177 - Part 8: Adjust layout for menu icons on toolbar. r=nechen,walkingice

MozReview-Commit-ID: 46l5Uw3zhO5

--HG--
extra : rebase_source : 4cac532e566c55f950ed0cf52df136449fb8bc2f

mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml

@@ -5,7 +5,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
        tools:background="@android:color/holo_green_light"
        tools:layout_height="@dimen/browser_toolbar_height"

mobile/android/app/src/photon/res/values-large/dimens.xml

@@ -19,7 +19,11 @@
     <dimen name="browser_toolbar_menu_radius">4dp</dimen>
     <dimen name="browser_toolbar_favicon_size">16dp</dimen>
 
-    <dimen name="browser_toolbar_image_button_width">56dp</dimen>
+    <dimen name="browser_toolbar_image_button_width">48dp</dimen>
+    <!-- ToolbarImageButton's pressed-highlight region is different from clickable region.
+         Our design is to make pressed-highlight region to be square. this vertical spacing value
+         helps drawable xml to set padding: (56 - 48) / 2 -->
+    <dimen name="browser_toolbar_image_button_v_spacing">4dp</dimen>
     <dimen name="browser_toolbar_image_button_h_spacing">4dp</dimen>
 
     <dimen name="browser_toolbar_site_security_width">34dp</dimen>
@@ -41,6 +45,5 @@
     <dimen name="tab_panel_grid_item_vpadding_autofit">8dp</dimen>
 
     <!-- PageActionButtons dimensions -->
-    <dimen name="page_action_button_width">56dp</dimen>
-
+    <dimen name="page_action_button_width">@dimen/browser_toolbar_icon_width</dimen>
 </resources>

mobile/android/app/src/photon/res/values-v17/styles.xml

@@ -31,7 +31,7 @@
 
     <style name="UrlBar.V17.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toStartOf">@id/menu</item>
-        <item name="android:layout_marginEnd">-4dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V17.TabCounter" />
@@ -55,7 +55,7 @@
         <item name="android:layout_toStartOf">@id/edit_cancel</item>
         <item name="android:paddingStart">8dp</item>
         <item name="android:paddingEnd">0dp</item>
-        <item name="android:layout_marginEnd">-2dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V17.DisplayLayout" />
@@ -63,12 +63,12 @@
     <style name="UrlBar.V17.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignStart">@id/url_bar_entry</item>
         <item name="android:layout_alignEnd">@id/url_bar_entry</item>
-        <item name="android:layout_marginEnd">-2dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
-    <style name="UrlBar.QRCode" parent="UrlBar.V15.QRCode"/>
-    <style name="UrlBar.V15.QRCode" parent="UrlBar.ImageButton">
-        <item name="android:layout_marginRight">-2dp</item>
+    <style name="UrlBar.QRCode" parent="UrlBar.V17.QRCode"/>
+    <style name="UrlBar.V17.QRCode" parent="UrlBar.ImageButton">
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
 </resources>

mobile/android/app/src/photon/res/values/dimens.xml

@@ -12,11 +12,11 @@
     <dimen name="autocomplete_row_height">32dp</dimen>
 
     <dimen name="browser_toolbar_height">56dp</dimen>
-    <dimen name="browser_toolbar_image_button_width">48dp</dimen>
+    <dimen name="browser_toolbar_image_button_width">42dp</dimen>
     <!-- ToolbarImageButton's pressed-highlight region is different from clickable region.
          Our design is to make pressed-highlight region to be square. this vertical spacing value
-         helps drawable xml to set padding: (56 - 48) / 2 -->
-    <dimen name="browser_toolbar_image_button_v_spacing">4dp</dimen>
+         helps drawable xml to set padding: (56 - 42) / 2 -->
+    <dimen name="browser_toolbar_image_button_v_spacing">7dp</dimen>
     <dimen name="browser_toolbar_image_button_h_spacing">0dp</dimen>
 
     <!-- This value is the height of the Tabs Panel header view
@@ -184,7 +184,7 @@
     <dimen name="tab_highlight_stroke_width">5dp</dimen>
 
     <!-- PageActionButtons dimensions -->
-    <dimen name="page_action_button_width">48dp</dimen>
+    <dimen name="page_action_button_width">@dimen/browser_toolbar_image_button_width</dimen>
 
     <!-- Banner -->
     <dimen name="home_banner_height">72dp</dimen>

mobile/android/app/src/photon/res/values/styles.xml

@@ -849,7 +849,7 @@
     <style name="UrlBar.Base.Tabs" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toLeftOf">@id/menu</item>
-        <item name="android:layout_marginRight">-4dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V15.TabCounter"/>
@@ -878,7 +878,7 @@
         <item name="android:layout_toLeftOf">@id/edit_cancel</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:paddingRight">0dp</item>
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V15.DisplayLayout"/>
@@ -887,12 +887,12 @@
     <style name="UrlBar.V15.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignLeft">@id/url_bar_entry</item>
         <item name="android:layout_alignRight">@id/url_bar_entry</item>
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.QRCode" parent="UrlBar.V15.QRCode"/>
     <style name="UrlBar.V15.QRCode" parent="UrlBar.ImageButton">
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
 </resources>