From ea66e3c8a0cfa98184c7be3b334f26e49e2cc92a Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 23 Dec 2021 19:40:12 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/22971 - Remove
 @color/above_dark_theme redirection

---
 app/src/main/res/layout/migration_list_item.xml | 2 +-
 app/src/main/res/layout/pbm_shortcut_popup.xml  | 2 +-
 app/src/main/res/values-night/colors.xml        | 2 +-
 app/src/main/res/values/colors.xml              | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/migration_list_item.xml b/app/src/main/res/layout/migration_list_item.xml
index 585c83aa3..5b17da21b 100644
--- a/app/src/main/res/layout/migration_list_item.xml
+++ b/app/src/main/res/layout/migration_list_item.xml
@@ -18,7 +18,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/mozac_ic_check"
-            tools:tint="@color/above_dark_theme" />
+            tools:tint="@color/photonDarkGrey50" />
 
     <TextView
             android:id="@+id/migration_item_name"
diff --git a/app/src/main/res/layout/pbm_shortcut_popup.xml b/app/src/main/res/layout/pbm_shortcut_popup.xml
index 23b43e1d5..fdcc9c0b1 100644
--- a/app/src/main/res/layout/pbm_shortcut_popup.xml
+++ b/app/src/main/res/layout/pbm_shortcut_popup.xml
@@ -50,7 +50,7 @@
             android:background="@drawable/rounded_gray_corners"
             android:text="@string/cfr_pos_button_text"
             android:textAllCaps="false"
-            android:textColor="@color/above_dark_theme"
+            android:textColor="@color/photonDarkGrey50"
             android:textSize="16sp"
             app:layout_constraintBottom_toTopOf="@id/cfr_neg_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cb898b851..9f2efa53b 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -103,7 +103,7 @@
     <color name="contrast_text_normal_theme">@color/primary_text_normal_theme</color>
     <color name="caption_text_normal_theme">@color/photonLightGrey70</color>
     <color name="foundation_normal_theme">@color/photonDarkGrey80</color>
-    <color name="above_normal_theme">@color/above_dark_theme</color>
+    <color name="above_normal_theme">@color/photonDarkGrey50</color>
     <color name="inset_normal_theme">@color/photonDarkGrey50</color>
     <color name="accent_normal_theme">@color/photonViolet50</color>
     <color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 15bf351d0..819b8711b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -149,7 +149,6 @@
     <color name="mozac_widget_favicon_border_light_theme">@color/photonLightGrey30</color>
 
     <!-- Dark theme color palette -->
-    <color name="above_dark_theme">@color/photonDarkGrey50</color>
     <color name="accent_bright_dark_theme">@color/photonViolet70</color>
     <color name="accent_high_contrast_dark_theme">@color/photonViolet40</color>