From 36188300010974fdd7c8bb682690ff6a72d9b2f0 Mon Sep 17 00:00:00 2001
From: Abhijit Valluri <avalluri2@bloomberg.net>
Date: Sun, 13 Sep 2020 20:13:07 +0100
Subject: [PATCH] Properly incorporate upstream fixes in tabs tray component

---
 .../java/org/mozilla/fenix/tabtray/TabTrayView.kt     | 11 +++--------
 app/src/main/res/drawable/ic_new.xml                  |  2 +-
 .../main/res/layout/component_tabs_screen_bottom.xml  |  1 +
 app/src/main/res/layout/component_tabs_screen_top.xml |  1 +
 app/src/main/res/layout/component_tabstray_top.xml    |  1 +
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index ef1ef8a98..6fe097bb9 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -262,14 +262,9 @@ class TabTrayView(
                     concatAdapter.addAdapter(syncedTabsController.adapter)
                 }
 
-                // Disabling the following block of code because it causes a crash when
-                // accessibility services are enabled! `notifyDataSetChanged()` is incompatible
-                // with concatAdapter. See: https://github.com/mozilla-mobile/fenix/issues/14540
-                // WARNING: Merging the upstream fix for this will cause lot of conflicts!
-                //
-                // if (hasAccessibilityEnabled) {
-                //    tabsAdapter.notifyItemRangeChanged(0, tabs.size)
-                // }
+                 if (hasAccessibilityEnabled) {
+                    tabsAdapter.notifyItemRangeChanged(0, tabs.size)
+                 }
 
                 if (!hasLoaded) {
                     hasLoaded = true
diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
index 57a1dbcd9..52f76c04b 100644
--- a/app/src/main/res/drawable/ic_new.xml
+++ b/app/src/main/res/drawable/ic_new.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/primary_text_normal_theme"
+        android:fillColor="?primaryText"
         android:pathData="M13,4a1,1 0,1 0,-2 0v7H4a1,1 0,1 0,0 2h7v7a1,1 0,1 0,2 0v-7h7a1,1 0,1 0,0 -2h-7V4z" />
 </vector>
diff --git a/app/src/main/res/layout/component_tabs_screen_bottom.xml b/app/src/main/res/layout/component_tabs_screen_bottom.xml
index 7c6234118..882a2d425 100644
--- a/app/src/main/res/layout/component_tabs_screen_bottom.xml
+++ b/app/src/main/res/layout/component_tabs_screen_bottom.xml
@@ -151,6 +151,7 @@
             app:layout_constraintBottom_toBottomOf="@id/tab_layout"
             app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
             app:layout_constraintTop_toTopOf="@id/tab_layout"
+            app:tint="@color/primary_text_normal_theme"
             app:srcCompat="@drawable/ic_new" />
 
         <ImageButton
diff --git a/app/src/main/res/layout/component_tabs_screen_top.xml b/app/src/main/res/layout/component_tabs_screen_top.xml
index ba8162aea..533254f94 100644
--- a/app/src/main/res/layout/component_tabs_screen_top.xml
+++ b/app/src/main/res/layout/component_tabs_screen_top.xml
@@ -151,6 +151,7 @@
             app:layout_constraintBottom_toBottomOf="@id/tab_layout"
             app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
             app:layout_constraintTop_toTopOf="@id/tab_layout"
+            app:tint="@color/primary_text_normal_theme"
             app:srcCompat="@drawable/ic_new" />
 
         <ImageButton
diff --git a/app/src/main/res/layout/component_tabstray_top.xml b/app/src/main/res/layout/component_tabstray_top.xml
index 09d16d7a8..f1439cd2d 100644
--- a/app/src/main/res/layout/component_tabstray_top.xml
+++ b/app/src/main/res/layout/component_tabstray_top.xml
@@ -138,6 +138,7 @@
             app:layout_constraintBottom_toBottomOf="@id/tab_layout"
             app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
             app:layout_constraintTop_toTopOf="@id/tab_layout"
+            app:tint="@color/primary_text_normal_theme"
             app:srcCompat="@drawable/ic_new" />
 
         <ImageButton