From 2baa4efa8d730b6d254ce2d6aad91e9697168075 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 25 Dec 2021 17:31:36 -0500
Subject: [PATCH] For #23193 - Remove
 @color/toolbar_[start|center|end]-gradient_normal_theme redirection

---
 .../mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt | 2 +-
 app/src/main/res/values-night/colors.xml                    | 3 ---
 app/src/main/res/values/colors.xml                          | 3 ---
 app/src/main/res/values/styles.xml                          | 6 +++---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
index 5373a70ca..ecaa85778 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
@@ -139,7 +139,7 @@ class FennecWebAppIntentProcessor(
 
     private fun createFallbackCustomTabConfig(): CustomTabConfig {
         return CustomTabConfig(
-            toolbarColor = ContextCompat.getColor(context, R.color.toolbar_center_gradient_normal_theme)
+            toolbarColor = ContextCompat.getColor(context, R.color.fx_mobile_layer_color_1)
         )
     }
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c49a03abc..55bef21be 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -115,9 +115,6 @@
     <color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_dark_theme</color>
     <color name="toggle_off_track_normal_theme">@color/toggle_off_track_dark_theme</color>
     <color name="accent_on_dark_background_normal_theme">@color/photonViolet40</color>
-    <color name="toolbar_start_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
-    <color name="toolbar_center_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
-    <color name="toolbar_end_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
     <color name="toolbar_divider_color_normal_theme">@color/photonDarkGrey10</color>
     <color name="fill_link_from_clipboard_normal_theme">@color/accent_on_dark_background_normal_theme</color>
     <color name="sync_disconnected_icon_fill_normal_theme">#FFF36E</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 75be8e625..49f90ff7e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -196,9 +196,6 @@
     <color name="destructive_normal_theme">@color/photonRed70</color>
     <color name="disabled_normal_theme">#6620123A</color>
     <color name="accent_on_dark_background_normal_theme">@color/photonViolet70</color>
-    <color name="toolbar_start_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
-    <color name="toolbar_center_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
-    <color name="toolbar_end_gradient_normal_theme">@color/fx_mobile_layer_color_1</color>
     <color name="toolbar_divider_color_normal_theme">@color/photonLightGrey50</color>
     <color name="fill_link_from_clipboard_normal_theme">@color/photonInk20</color>
     <color name="sync_disconnected_icon_fill_normal_theme">@color/photonYellow70</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0cbff8ac1..f9591e272 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,9 +63,9 @@
         <item name="scrimEnd">@color/fx_mobile_layer_color_scrim_end</item>
         <item name="snackbar">@color/fx_mobile_action_color_primary</item>
         <item name="accentUsedOnDarkBackground">@color/accent_on_dark_background_normal_theme</item>
-        <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="toolbarStartGradient">@color/fx_mobile_layer_color_1</item>
+        <item name="toolbarCenterGradient">@color/fx_mobile_layer_color_1</item>
+        <item name="toolbarEndGradient">@color/fx_mobile_layer_color_1</item>
         <item name="toolbarDivider">@color/toolbar_divider_color_normal_theme</item>
         <item name="fillLinkFromClipboard">@color/fill_link_from_clipboard_normal_theme</item>
         <item name="syncDisconnected">@color/sync_disconnected_icon_fill_normal_theme</item>