From 626f916d1b33b931ac027b99d711f354107c0a7a Mon Sep 17 00:00:00 2001
From: Adam Novak <interfect@gmail.com>
Date: Wed, 9 Sep 2020 21:53:03 -0700
Subject: [PATCH] Mirror tab_tray_item changes in tab_tray_item_compact to
 prevent a crash when compact tabs are enabled

---
 .../main/res/layout/tab_tray_item_compact.xml | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/tab_tray_item_compact.xml b/app/src/main/res/layout/tab_tray_item_compact.xml
index 5b65659dc..817eeb7c7 100644
--- a/app/src/main/res/layout/tab_tray_item_compact.xml
+++ b/app/src/main/res/layout/tab_tray_item_compact.xml
@@ -51,25 +51,7 @@
             android:layout_height="match_parent"
             android:contentDescription="@string/mozac_browser_tabstray_open_tab" />
 
-        <View
-            android:id="@+id/selected_mask"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/tab_tray_selected_mask_normal_theme"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/checkmark"
-            android:contentDescription="@string/tab_tray_multiselect_selected_content_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|center_vertical"
-            android:background="@drawable/favicon_background"
-            android:backgroundTint="@color/accent_normal_theme"
-            android:elevation="1dp"
-            android:padding="10dp"
-            android:visibility="gone"
-            app:srcCompat="@drawable/mozac_ic_check" />
+        <include layout="@layout/checkbox_item" />
 
     </androidx.cardview.widget.CardView>
 
@@ -105,7 +87,7 @@
         android:textColor="@color/tab_tray_item_text_normal_theme"
         android:textSize="14sp"
         android:visibility="visible"
-        tools:text="Webpage tile that is long and will overflow textview widget"
+        tools:text="Example Domain"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
         app:layout_constraintStart_toEndOf="@id/mozac_browser_tabstray_icon_card"
         app:layout_constraintTop_toTopOf="parent" />
@@ -119,7 +101,7 @@
         android:paddingStart="8dp"
         android:textColor="@color/tab_tray_item_url_normal_theme"
         android:textSize="14sp"
-        tools:text="https://www.google.com"
+        tools:text="example.com"
         android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
         app:layout_constraintHorizontal_bias="0.0"