From 5fcc486caad7390d2a3139f4a49b3f31c6ca49b0 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Tue, 6 Oct 2020 13:06:57 -0400
Subject: [PATCH] For #15115 - Part 6: Display the tab's favicon in the grid
 view

---
 .../mozilla/fenix/tabtray/TabTrayViewHolder.kt    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 dddaeceb1..6ee6bb800 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
@@ -50,6 +50,8 @@ class TabTrayViewHolder(
     private val metrics: MetricController = itemView.context.components.analytics.metrics
 ) : TabViewHolder(itemView) {
 
+    private val faviconView: ImageView? =
+        itemView.findViewById(R.id.mozac_browser_tabstray_favicon_icon)
     private val titleView: TextView = itemView.findViewById(R.id.mozac_browser_tabstray_title)
     private val closeView: AppCompatImageButton =
         itemView.findViewById(R.id.mozac_browser_tabstray_close)
@@ -73,12 +75,10 @@ class TabTrayViewHolder(
     ) {
         this.tab = tab
 
-        // Basic text
         updateTitle(tab)
         updateUrl(tab)
+        updateFavicon(tab)
         updateCloseButtonDescription(tab.title)
-
-        // Drawables and theme
         updateBackgroundColor(isSelected)
 
         if (tab.thumbnail != null) {
@@ -140,6 +140,15 @@ class TabTrayViewHolder(
         }
     }
 
+    private fun updateFavicon(tab: Tab) {
+        if (tab.icon != null) {
+            faviconView?.visibility = View.VISIBLE
+            faviconView?.setImageBitmap(tab.icon)
+        } else {
+            faviconView?.visibility = View.GONE
+        }
+    }
+
     private fun updateTitle(tab: Tab) {
         val title = if (tab.title.isNotEmpty()) {
             tab.title