From 635413def19075688ebfb4dedba1c5caad568811 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sun, 20 Feb 2022 13:49:30 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23907 - Replace
 tabTrayItemMediaBackground attribute with accent

tabTrayItemMediaBackground and accent are equivalent
---
 app/src/main/res/drawable/media_state_background.xml | 2 +-
 app/src/main/res/values/attrs.xml                    | 1 -
 app/src/main/res/values/colors.xml                   | 3 ---
 app/src/main/res/values/styles.xml                   | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/res/drawable/media_state_background.xml b/app/src/main/res/drawable/media_state_background.xml
index 5175bc53a8..5ac04bbb0f 100644
--- a/app/src/main/res/drawable/media_state_background.xml
+++ b/app/src/main/res/drawable/media_state_background.xml
@@ -8,7 +8,7 @@
         android:width="24dp"
         android:height="24dp" />
     <!-- Background color of the circle -->
-    <solid android:color="?tabTrayItemMediaBackground" />
+    <solid android:color="?accent" />
     <!-- Outer circle border -->
     <stroke android:color="@color/photonWhite"
         android:width="2dp"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 70198c8588..6caa2a5520 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -58,7 +58,6 @@
     <attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/>
 
     <!-- Tab tray -->
-    <attr name="tabTrayItemMediaBackground" format="reference" />
     <attr name="tabTrayThumbnailItemBackground" format="reference" />
     <attr name="tabTrayThumbnailIcon" format="reference" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7c8dc27c07..9aa1c206d0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -274,9 +274,6 @@
     <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color>
     <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color>
 
-    <!-- Tab Tray -->
-    <color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</color>
-
     <!-- Normal theme colors for light mode -->
     <color name="caption_text_normal_theme">@color/photonLightGrey90</color>
     <color name="inset_normal_theme">@color/photonLightGrey30</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5f4fbbf0c0..e7d20b3bc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -91,7 +91,6 @@
         <item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item>
         <item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item>
 
-        <item name="tabTrayItemMediaBackground">@color/accent_normal_theme</item>
         <item name="tabTrayThumbnailItemBackground">@color/tab_tray_item_thumbnail_background_normal_theme</item>
         <item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>
 
@@ -268,7 +267,6 @@
         <item name="mozac_widget_favicon_border_color">@color/photonInk50</item>
 
         <!-- Tab Tray -->
-        <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
         <item name="tabTrayThumbnailItemBackground">@color/tab_tray_item_thumbnail_background_normal_theme</item>
         <item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>