From a81952916fcded7274b40adb56b4afb62c5ab3a7 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 21 Aug 2014 17:14:26 +0100
Subject: [PATCH] Bug 1054371 - Part 1: Use solid stroke in back/forward
 buttons (r=mcomella)

---
 .../base/resources/values-large-v11/styles.xml      |  2 +-
 mobile/android/base/resources/values/dimens.xml     |  2 +-
 mobile/android/base/toolbar/BackButton.java         | 13 ++-----------
 mobile/android/base/toolbar/ForwardButton.java      | 13 ++-----------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index 1f66f40ac498..76b6eb1cccce 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -8,7 +8,7 @@
     <style name="UrlBar.ImageButton.Forward">
         <item name="android:contentDescription">@string/forward</item>
         <item name="android:layout_width">45dip</item>
-        <item name="android:layout_height">36dip</item>
+        <item name="android:layout_height">37dip</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingTop">7dp</item>
         <item name="android:paddingBottom">7dp</item>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index e3ae2cc48a2b..e345435a71f1 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -53,7 +53,7 @@
     <dimen name="menu_item_more_offset">5dp</dimen>
     <dimen name="menu_popup_offset">12dp</dimen>
     <dimen name="menu_popup_width">256dp</dimen>
-    <dimen name="nav_button_border_width">0.75dp</dimen>
+    <dimen name="nav_button_border_width">1dp</dimen>
     <dimen name="prompt_service_group_padding_size">32dp</dimen>
     <dimen name="prompt_service_icon_size">36dp</dimen>
     <dimen name="prompt_service_icon_text_padding">10dp</dimen>
diff --git a/mobile/android/base/toolbar/BackButton.java b/mobile/android/base/toolbar/BackButton.java
index 94d8eddaa024..d9063d629203 100644
--- a/mobile/android/base/toolbar/BackButton.java
+++ b/mobile/android/base/toolbar/BackButton.java
@@ -28,10 +28,11 @@ public class BackButton extends ShapedButton {
         // Paint to draw the border.
         mBorderPaint = new Paint();
         mBorderPaint.setAntiAlias(true);
-        mBorderPaint.setColor(0xFF000000);
+        mBorderPaint.setColor(0xFFB5B5B5);
         mBorderPaint.setStyle(Paint.Style.STROKE);
 
         mBorderPrivatePaint = new Paint(mBorderPaint);
+        mBorderPrivatePaint.setColor(0xFF363B40);
 
         // Path is masked.
         mPath = new Path();
@@ -51,16 +52,6 @@ public class BackButton extends ShapedButton {
 
         mBorderPath.reset();
         mBorderPath.addCircle(width/2, height/2, (width/2) - borderWidth, Path.Direction.CW);
-
-        mBorderPaint.setShader(new LinearGradient(0, 0, 
-                                                  0, height, 
-                                                  0xFFB5BBC1, 0xFFFAFBFC,
-                                                  Shader.TileMode.CLAMP));
-
-        mBorderPrivatePaint.setShader(new LinearGradient(0, 0, 
-                                                         0, height, 
-                                                         0xFF040607, 0xFF0B0D0E,
-                                                         Shader.TileMode.CLAMP));
     }
 
     @Override
diff --git a/mobile/android/base/toolbar/ForwardButton.java b/mobile/android/base/toolbar/ForwardButton.java
index 870f97817b92..e78f61bd62ff 100644
--- a/mobile/android/base/toolbar/ForwardButton.java
+++ b/mobile/android/base/toolbar/ForwardButton.java
@@ -27,10 +27,11 @@ public class ForwardButton extends ShapedButton {
         // Paint to draw the border.
         mBorderPaint = new Paint();
         mBorderPaint.setAntiAlias(true);
-        mBorderPaint.setColor(0xFF000000);
+        mBorderPaint.setColor(0xFFB5B5B5);
         mBorderPaint.setStyle(Paint.Style.STROKE);
 
         mBorderPrivatePaint = new Paint(mBorderPaint);
+        mBorderPrivatePaint.setColor(0xFF363B40);
 
         mBorderPath = new Path();
     }
@@ -46,16 +47,6 @@ public class ForwardButton extends ShapedButton {
         mBorderPath.reset();
         mBorderPath.moveTo(width - borderWidth, 0);
         mBorderPath.lineTo(width - borderWidth, height);
-
-        mBorderPaint.setShader(new LinearGradient(0, 0, 
-                                                  0, height, 
-                                                  0xFFB5BBC1, 0xFFFAFBFC,
-                                                  Shader.TileMode.CLAMP));
-
-        mBorderPrivatePaint.setShader(new LinearGradient(0, 0, 
-                                                         0, height, 
-                                                         0xFF040607, 0xFF0B0D0E,
-                                                         Shader.TileMode.CLAMP));
     }
 
     @Override