From 8ab0a3797c3e49e28762b490150536757d706112 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 4 Nov 2014 11:10:00 -0800
Subject: [PATCH] Bug 1085487 - Part 1: Center the reload button. r=lucasr

---
 .../base/resources/values-large-v11/styles.xml   | 16 +++++++++++++---
 mobile/android/base/resources/values/dimens.xml  |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index 4ef0fddcdd0c..12e142e90422 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -104,9 +104,19 @@
         <item name="android:scaleType">center</item>
         <item name="android:background">@drawable/new_tablet_action_bar_button</item>
 
-        <!-- layout_* doesn't work here, likely because it's an ImageButton, so we use padding instead. -->
-        <item name="android:paddingTop">@dimen/new_tablet_browser_toolbar_menu_item_padding_vertical</item>
-        <item name="android:paddingBottom">@dimen/new_tablet_browser_toolbar_menu_item_padding_vertical</item>
+        <!-- layout_width/height doesn't work here, likely because it's
+             an ImageButton, so we use padding instead.
+
+             Because the curve of the reload button is lower than the end of the arrow and thus
+             the top of the view, it is perceived to be slighly lower than the other buttons.
+             Thus we use padding to fill a slightly smaller height than the toolbar and let
+             android:gravity center the image with a slight offset (.5dp higher) instead. Note that
+             this offset also affects the pressed state, but it's hardly noticeable and thus negligible.
+
+             Note: the above change is done on a generic style and thus any other items added
+             to the menu bar may appear to be offset. -->
+        <item name="android:paddingTop">20dp</item>
+        <item name="android:paddingBottom">21dp</item>
         <item name="android:paddingLeft">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
         <item name="android:paddingRight">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
     </style>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 45daa8317afb..e2ce1932917b 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -36,7 +36,6 @@
     <dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
     <!-- Padding combines with an 18dp image to form the menu item width and height. -->
     <dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_item_padding_vertical">21dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_corner_radius">5dp</dimen>