From 4a63f98b62f8587a2ec1e3c80b9a12de5035b572 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sun, 16 Jan 2022 17:31:31 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23341 - Replace
 @color/disabled_normal_theme with @color/fx_mobile_text_color_disabled

---
 app/src/main/res/values-night/colors.xml | 3 +--
 app/src/main/res/values/colors.xml       | 3 +--
 app/src/main/res/values/styles.xml       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ed13e5fd39..a3bdcc2cb9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -56,7 +56,7 @@
     <!-- Secondary text -->
     <color name="fx_mobile_text_color_secondary">@color/photonLightGrey40</color>
     <!-- Disabled text -->
-    <color name="fx_mobile_text_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
+    <color name="fx_mobile_text_color_disabled">@color/photonLightGrey05A40</color>
     <!-- Warning text -->
     <color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color>
     <!-- Small heading, Text link -->
@@ -126,7 +126,6 @@
     <color name="neutral_normal_theme">@color/photonGrey20</color>
     <color name="neutral_faded_normal_theme">#1FFBFBFE</color>
     <color name="destructive_normal_theme">@color/photonRed40</color>
-    <color name="disabled_normal_theme">@color/photonLightGrey05A40</color>
     <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="toolbar_divider_color_normal_theme">@color/photonDarkGrey10</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cb6ea8866b..b0e25ddc08 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -56,7 +56,7 @@
     <!-- Secondary text -->
     <color name="fx_mobile_text_color_secondary">@color/photonDarkGrey05</color>
     <!-- Disabled text -->
-    <color name="fx_mobile_text_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
+    <color name="fx_mobile_text_color_disabled">@color/photonDarkGrey90A40</color>
     <!-- Warning text -->
     <color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
     <!-- Small heading, Text link -->
@@ -200,7 +200,6 @@
     <color name="neutral_normal_theme">@color/photonGrey30</color>
     <color name="neutral_faded_normal_theme">@color/photonGrey20</color>
     <color name="destructive_normal_theme">@color/photonRed70</color>
-    <color name="disabled_normal_theme">#6620123A</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 389e7ed5d3..610a82388b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,7 +60,7 @@
         <item name="neutral">@color/neutral_normal_theme</item>
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="destructive">@color/destructive_normal_theme</item>
-        <item name="disabled">@color/disabled_normal_theme</item>
+        <item name="disabled">@color/fx_mobile_text_color_disabled</item>
         <item name="scrimStart">@color/fx_mobile_layer_color_scrim_start</item>
         <item name="scrimEnd">@color/fx_mobile_layer_color_scrim_end</item>
         <item name="snackbar">@color/fx_mobile_action_color_primary</item>