From 949545d88a66b4f412af0b861693e9869b02e259 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 16 Oct 2021 22:33:29 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/22800 - Remove unused
 tabTrayToolbarBackground attribute

---
 app/src/main/res/values-night/colors.xml | 1 -
 app/src/main/res/values/attrs.xml        | 2 --
 app/src/main/res/values/colors.xml       | 2 --
 app/src/main/res/values/styles.xml       | 2 --
 4 files changed, 7 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a728e24aa..13c31b27e 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -148,7 +148,6 @@
     <color name="tab_tray_item_url_normal_theme">@color/photonLightGrey60</color>
     <color name="tab_tray_item_background_normal_theme">@color/photonDarkGrey80</color>
     <color name="tab_tray_item_selected_background_normal_theme">@color/tab_tray_item_selected_background_dark_theme</color>
-    <color name="tab_tray_toolbar_background_normal_theme">@color/photonDarkGrey50</color>
     <color name="tab_tray_item_divider_normal_theme">@color/photonDarkGrey10</color>
     <color name="tab_tray_item_media_background_normal_theme">@color/photonViolet50</color>
     <color name="tab_tray_heading_icon_normal_theme">@color/tab_tray_heading_icon_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index e908f7920..62ab3a83c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -63,8 +63,6 @@
     <attr name="tabTrayHeadingIconInactive" format="reference" />
     <attr name="tabTrayThumbnailItemBackground" format="reference" />
     <attr name="tabTrayThumbnailIcon" format="reference" />
-    <!-- Note - these are currently unused, but they are for if/when we add private UI to tabs tray -->
-    <attr name="tabTrayToolbarBackground" format="reference" />
 
     <!-- Tab History -->
     <attr name="tabHistoryItemSelectedBackground" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 41d30b1d3..3ca27a5cd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -164,7 +164,6 @@
     <color name="mozac_widget_favicon_border_private_theme">@color/photonInk50</color>
 
     <!-- Tab Tray -->
-    <color name="tab_tray_toolbar_background_private_theme">@color/photonInk50</color>
     <color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</color>
 
     <!-- Tab History -->
@@ -221,7 +220,6 @@
     <color name="tab_tray_item_url_normal_theme">@color/photonDarkGrey05</color>
     <color name="tab_tray_item_background_normal_theme">@color/photonLightGrey10</color>
     <color name="tab_tray_item_selected_background_normal_theme">#E5DFF4</color>
-    <color name="tab_tray_toolbar_background_normal_theme">@color/photonLightGrey10</color>
     <color name="tab_tray_item_divider_normal_theme">@color/photonLightGrey30</color>
     <color name="tab_tray_item_media_background_normal_theme">@color/photonInk20</color>
     <color name="tab_tray_heading_icon_normal_theme">@color/photonInk20</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ad4fb5e0e..19bdf03b2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -90,7 +90,6 @@
         <item name="mozac_widget_favicon_background_color">@color/mozac_widget_favicon_background_normal_theme</item>
         <item name="mozac_widget_favicon_border_color">@color/mozac_widget_favicon_border_normal_theme</item>
 
-        <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
         <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_normal_theme</item>
         <item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_normal_theme</item>
         <item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_normal_theme</item>
@@ -274,7 +273,6 @@
         <item name="mozac_widget_favicon_border_color">@color/mozac_widget_favicon_border_private_theme</item>
 
         <!-- Tab Tray -->
-        <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
         <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
         <item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_dark_theme</item>
         <item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_dark_theme</item>