From bafbea1512f36b7c8771bf865ac234d8e411e608 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Wed, 11 Sep 2019 11:46:00 -0700
Subject: [PATCH] No issue: Set color for toolbar divider (#5221)

---
 app/src/main/res/layout/component_search.xml | 7 ++++---
 app/src/main/res/values-night/colors.xml     | 1 +
 app/src/main/res/values/attrs.xml            | 1 +
 app/src/main/res/values/colors.xml           | 4 ++++
 app/src/main/res/values/styles.xml           | 2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/component_search.xml b/app/src/main/res/layout/component_search.xml
index 9069609f8..a6f1a508d 100644
--- a/app/src/main/res/layout/component_search.xml
+++ b/app/src/main/res/layout/component_search.xml
@@ -7,13 +7,14 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/browser_toolbar_height"
+    android:layout_gravity="bottom"
+    android:background="@drawable/toolbar_background"
     android:clickable="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:layout_gravity="bottom"
-    android:background="@drawable/toolbar_background"
     app:browserToolbarClearColor="?primaryText"
     app:browserToolbarInsecureColor="?primaryText"
     app:browserToolbarMenuColor="?primaryText"
     app:browserToolbarProgressBarGravity="top"
-    app:browserToolbarSecureColor="?primaryText" />
+    app:browserToolbarSecureColor="?primaryText"
+    app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 60cdab46e..909a96cb2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -28,6 +28,7 @@
     <color name="toolbar_start_gradient_normal_theme">@color/toolbar_start_gradient_dark_theme</color>
     <color name="toolbar_center_gradient_normal_theme">@color/toolbar_center_gradient_dark_theme</color>
     <color name="toolbar_end_gradient_normal_theme">@color/toolbar_end_gradient_dark_theme</color>
+    <color name="toolbar_divider_color_normal_theme">@color/toolbar_divider_color_dark_theme</color>
 
     <!-- Collection icons-->
     <color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index cc166103d..52a560a6f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,6 +23,7 @@
     <attr name="disabled" format="reference" />
     <attr name="scrimStart" format="reference"/>
     <attr name="scrimEnd" format="reference"/>
+    <attr name="toolbarDivider" format="reference"/>
 
     <!-- Misc -->
     <attr name="homeBackground" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6dd53c527..f3267e29a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,6 +29,7 @@
     <color name="toolbar_start_gradient_light_theme">@color/foundation_light_theme</color>
     <color name="toolbar_center_gradient_light_theme">@color/foundation_light_theme</color>
     <color name="toolbar_end_gradient_light_theme">@color/foundation_light_theme</color>
+    <color name="toolbar_divider_color_light_theme">#CDCCCF</color>
 
     <!-- Dark theme color palette -->
     <color name="primary_text_dark_theme">#FBFBFE</color>
@@ -56,6 +57,7 @@
     <color name="toolbar_start_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_center_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_end_gradient_dark_theme">@color/foundation_dark_theme</color>
+    <color name="toolbar_divider_color_dark_theme">#45444D</color>
 
     <!-- Private theme color palette -->
     <color name="primary_text_private_theme">#FBFBFE</color>
@@ -80,6 +82,7 @@
     <color name="toolbar_start_gradient_private_theme">#7529A7</color>
     <color name="toolbar_center_gradient_private_theme">#492E85</color>
     <color name="toolbar_end_gradient_private_theme">#383372</color>
+    <color name="toolbar_divider_color_private_theme">#403760</color>
 
     <!-- Normal theme colors for light mode -->
     <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@@ -104,6 +107,7 @@
     <color name="toolbar_start_gradient_normal_theme">@color/toolbar_start_gradient_light_theme</color>
     <color name="toolbar_center_gradient_normal_theme">@color/toolbar_center_gradient_light_theme</color>
     <color name="toolbar_end_gradient_normal_theme">@color/toolbar_end_gradient_light_theme</color>
+    <color name="toolbar_divider_color_normal_theme">@color/toolbar_divider_color_light_theme</color>
 
     <!-- Bookmark buttons -->
     <color name="bookmark_favicon_background">#DFDFE3</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0d25fbfa6..7a3aeed0a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,6 +48,7 @@
         <item name="toolbarStartGradient">@color/toolbar_start_gradient_normal_theme</item>
         <item name="toolbarCenterGradient">@color/toolbar_center_gradient_normal_theme</item>
         <item name="toolbarEndGradient">@color/toolbar_end_gradient_normal_theme</item>
+        <item name="toolbarDivider">@color/toolbar_divider_color_normal_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
@@ -129,6 +130,7 @@
         <item name="toolbarStartGradient">@color/toolbar_start_gradient_private_theme</item>
         <item name="toolbarCenterGradient">@color/toolbar_center_gradient_private_theme</item>
         <item name="toolbarEndGradient">@color/toolbar_end_gradient_private_theme</item>
+        <item name="toolbarDivider">@color/toolbar_divider_color_private_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>