From 19a709a04d41688dbbd1aa8dc67d6960891a63f4 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Fri, 29 May 2020 18:31:25 -0700 Subject: [PATCH] For #10848 - Fixes tab tray colors --- .../java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt | 8 ++++---- app/src/main/res/drawable/tab_tray_divider.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt index 63ecce51a..e5421d512 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt @@ -145,15 +145,15 @@ class TabTrayViewHolder(itemView: View) : TabViewHolder(itemView) { @VisibleForTesting internal fun updateBackgroundColor(isSelected: Boolean) { - val itemBackground = if (isSelected) { - R.attr.tabTrayItemSelectedBackground + val color = if (isSelected) { + R.color.tab_tray_item_selected_background_normal_theme } else { - R.attr.tabTrayItemBackground + R.color.tab_tray_item_background_normal_theme } itemView.setBackgroundColor( ContextCompat.getColor( itemView.context, - ThemeManager.resolveAttribute(itemBackground, itemView.context) + color ) ) } diff --git a/app/src/main/res/drawable/tab_tray_divider.xml b/app/src/main/res/drawable/tab_tray_divider.xml index d9ec10609..24190490e 100644 --- a/app/src/main/res/drawable/tab_tray_divider.xml +++ b/app/src/main/res/drawable/tab_tray_divider.xml @@ -6,7 +6,7 @@ - +