From 91402f9b38028e76ac743a8cd9caecdbd1e02015 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 29 May 2020 18:16:57 -0700
Subject: [PATCH] For #10848 - Fixes icon colors and missing divider

---
 app/src/main/res/color/tab_icon.xml            | 4 ++--
 app/src/main/res/layout/component_tabstray.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/color/tab_icon.xml b/app/src/main/res/color/tab_icon.xml
index 3513e79f2..48ad13b5b 100644
--- a/app/src/main/res/color/tab_icon.xml
+++ b/app/src/main/res/color/tab_icon.xml
@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?tabTrayHeadingIcon" android:state_selected="true" />
-    <item android:color="?tabTrayHeadingIconInactive" />
+    <item android:color="@color/tab_tray_heading_icon_normal_theme" android:state_selected="true" />
+    <item android:color="@color/tab_tray_heading_icon_inactive_normal_theme" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 190ca2b39..fee2da4ad 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -85,7 +85,7 @@
         android:id="@+id/divider"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?tabTrayItemDivider"
+        android:background="@color/tab_tray_item_divider_normal_theme"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tab_layout" />
@@ -99,7 +99,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tab_layout"
+        app:layout_constraintTop_toBottomOf="@+id/divider"
         mozac:tabsTrayItemBackgroundColor="@color/foundation_normal_theme"
         mozac:tabsTrayItemTextColor="@color/tab_tray_item_text_normal_theme"
         mozac:tabsTraySelectedItemBackgroundColor="@color/tab_tray_item_selected_background_normal_theme"