From e612cfefc24156bc24054eafc0aa88611bf0dfa1 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 24 Sep 2014 15:45:07 -0700
Subject: [PATCH] Bug 1058909 - Part 4: Adjust forward button position and
 spacing. r=lucasr

---
 .../layout-large-v11/new_tablet_browser_toolbar.xml |  6 ++----
 .../base/resources/values-large-v11/dimens.xml      |  3 +++
 .../base/resources/values-large-v11/styles.xml      | 13 +++++++++++--
 mobile/android/base/resources/values/dimens.xml     |  1 -
 .../base/toolbar/BrowserToolbarNewTablet.java       | 10 +---------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
index ce925fdf3a9c..3279df511fec 100644
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -19,7 +19,7 @@
                android:focusable="false"
                android:background="@drawable/url_bar_entry"/>
 
-    <org.mozilla.gecko.toolbar.ForwardButton style="@style/UrlBar.ImageButton.Forward"
+    <org.mozilla.gecko.toolbar.ForwardButton style="@style/UrlBar.ImageButton.Forward.NewTablet"
                                              android:id="@+id/forward"
                                              android:layout_alignLeft="@id/back"/>
 
@@ -43,9 +43,7 @@
                   android:layout_toRightOf="@id/back"
                   android:layout_toLeftOf="@id/menu_items"/>
 
-    <!-- We add extra padding to the left side to compensate for site security's
-         negative margin, which is used to move the site security icon closer to
-         the favicon in toolbar_display_layout. -->
+    <!-- Values of marginLeft are used to animate the forward button so don't change its value. -->
     <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
                   style="@style/UrlBar.Button.Container"
                   android:layout_toRightOf="@id/back"
diff --git a/mobile/android/base/resources/values-large-v11/dimens.xml b/mobile/android/base/resources/values-large-v11/dimens.xml
index 547af63bd679..c52e78b580b7 100644
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -12,6 +12,9 @@
     <dimen name="back_button_width">42dp</dimen>
     <dimen name="back_button_width_half">21dp</dimen>
 
+    <dimen name="forward_default_offset">-13dip</dimen>
+    <dimen name="new_tablet_forward_default_offset">-6dp</dimen>
+
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
 
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index ce67c0eccbbc..afa8cd646a63 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -21,12 +21,21 @@
         <item name="android:layout_marginLeft">@dimen/forward_default_offset</item>
     </style>
 
+    <style name="UrlBar.ImageButton.Forward.NewTablet">
+        <item name="android:layout_marginLeft">@dimen/new_tablet_forward_default_offset</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:layout_marginTop">11.5dp</item>
+        <item name="android:layout_marginBottom">11.5dp</item>
+        <item name="android:src">@drawable/new_tablet_ic_menu_forward</item>
+    </style>
+
     <style name="UrlBar.ImageButton.TabCount.NewTablet">
         <item name="android:background">@drawable/new_tablet_tabs_count</item>
     </style>
 
-
-   <style name="UrlBar.Button.Container">
+    <style name="UrlBar.Button.Container">
         <item name="android:layout_marginTop">6dp</item>
         <item name="android:layout_marginBottom">6dp</item>
         <!-- Start with forward hidden -->
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 50ed658e8cd0..e775673ec13e 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -88,7 +88,6 @@
     <dimen name="text_selection_handle_shadow">11dp</dimen>
     <dimen name="validation_message_height">50dp</dimen>
     <dimen name="validation_message_margin_top">6dp</dimen>
-    <dimen name="forward_default_offset">-13dip</dimen>
     <dimen name="url_bar_offset_left">32dp</dimen>
     <dimen name="history_tab_indicator_height">50dp</dimen>
 
diff --git a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
index 123b5e023e0f..c62677783f5b 100644
--- a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
@@ -12,7 +12,6 @@ import org.mozilla.gecko.animation.ViewHelper;
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
-import android.view.View;
 
 /**
  * A toolbar implementation for the tablet redesign (bug 1014156).
@@ -30,7 +29,7 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
 
         final Resources res = getResources();
         urlBarViewOffset = res.getDimensionPixelSize(R.dimen.url_bar_offset_left);
-        defaultForwardMargin = res.getDimensionPixelSize(R.dimen.forward_default_offset);
+        defaultForwardMargin = res.getDimensionPixelSize(R.dimen.new_tablet_forward_default_offset);
     }
 
     @Override
@@ -48,15 +47,8 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
         hideUrlEditLayout();
     }
 
-    // TODO: Copy-pasta from BrowserToolbarTablet - implement a correctly working version.
     @Override
     protected void animateForwardButton(final ForwardButtonAnimation animation) {
-        // If the forward button is not visible, we must be
-        // in the phone UI.
-        if (forwardButton.getVisibility() != View.VISIBLE) {
-            return;
-        }
-
         final boolean showing = (animation == ForwardButtonAnimation.SHOW);
 
         // if the forward button's margin is non-zero, this means it has already