From 4b851e96497e581f266107e3ddb84a8a72f25b2c Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 22 Jun 2023 15:46:17 -0400
Subject: [PATCH] Bug 1839651 - Remove the "downloading" add-on popup.

---
 .../fenix/addons/AddonsManagementFragment.kt  |  2 -
 .../drawable/mozac_ic_extensions_black.xml    | 13 ------
 .../layout/fragment_add_ons_management.xml    |  8 ----
 .../res/layout/overlay_add_on_progress.xml    | 44 -------------------
 4 files changed, 67 deletions(-)
 delete mode 100644 app/src/main/res/drawable/mozac_ic_extensions_black.xml
 delete mode 100644 app/src/main/res/layout/overlay_add_on_progress.xml

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index eb34a342e..f6d41095b 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -214,7 +214,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                 runIfFragmentIsAttached {
                     isInstallationInProgress = false
                     adapter?.updateAddon(it)
-                    binding?.addonProgressOverlay?.overlayCardView?.visibility = View.GONE
                 }
             },
             onError = { _, e ->
@@ -232,7 +231,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                             )
                         }
                     }
-                    binding?.addonProgressOverlay?.overlayCardView?.visibility = View.GONE
                     isInstallationInProgress = false
                 }
             },
diff --git a/app/src/main/res/drawable/mozac_ic_extensions_black.xml b/app/src/main/res/drawable/mozac_ic_extensions_black.xml
deleted file mode 100644
index 9395d6040..000000000
--- a/app/src/main/res/drawable/mozac_ic_extensions_black.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?android:attr/textColorPrimary"
-        android:pathData="M17.5,7H15.5V5.127C15.5,3.533 14.317,2.166 12.807,2.015C11.958,1.931 11.116,2.206 10.488,2.775C9.86,3.342 9.5,4.154 9.5,4.999V7H6.5C5.119,7 4,8.119 4,9.5V11.75C4,12.44 4.56,13 5.25,13H6.873C7.706,13 8.417,13.59 8.493,14.343C8.536,14.775 8.402,15.188 8.114,15.506C7.829,15.82 7.424,16 7.001,16H5.25C4.56,16 4,16.56 4,17.25V19.5C4,20.881 5.119,22 6.5,22H17.5C18.881,22 20,20.881 20,19.5V9.5C20,8.119 18.881,7 17.5,7ZM18.5,19.7L17.7,20.5H6.3L5.5,19.7V17.5H7.001C7.847,17.5 8.658,17.14 9.226,16.512C9.794,15.885 10.07,15.039 9.985,14.194C9.834,12.683 8.467,11.5 6.873,11.5H5.5V9.3L6.3,8.5H10C10.552,8.5 11,8.052 11,7.5V4.999C11,4.576 11.18,4.171 11.494,3.887C11.812,3.599 12.227,3.466 12.657,3.507C13.41,3.582 14,4.294 14,5.127V7.5C14,8.052 14.448,8.5 15,8.5H17.7L18.5,9.3V19.7Z" />
-</vector>
diff --git a/app/src/main/res/layout/fragment_add_ons_management.xml b/app/src/main/res/layout/fragment_add_ons_management.xml
index bdd07cbaa..36a28f233 100644
--- a/app/src/main/res/layout/fragment_add_ons_management.xml
+++ b/app/src/main/res/layout/fragment_add_ons_management.xml
@@ -15,14 +15,6 @@
         android:layout_marginTop="2dp"
         tools:context=".BrowserActivity" />
 
-    <include
-        android:id="@+id/addonProgressOverlay"
-        layout="@layout/overlay_add_on_progress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:visibility="gone" />
-
     <ProgressBar
         android:id="@+id/add_ons_progress_bar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/overlay_add_on_progress.xml b/app/src/main/res/layout/overlay_add_on_progress.xml
deleted file mode 100644
index d12dc2027..000000000
--- a/app/src/main/res/layout/overlay_add_on_progress.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/. -->
-
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/overlay_card_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:elevation="1dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/add_ons_overlay_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:drawablePadding="8dp"
-            android:gravity="start|center_vertical"
-            android:padding="16dp"
-            android:text="@string/mozac_add_on_install_progress_caption"
-            app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />
-
-        <Button
-            android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/add_ons_overlay_text"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            android:text="@string/mozac_feature_addons_install_addon_dialog_cancel"
-            android:textAlignment="center"
-            android:textAllCaps="false" />
-
-    </RelativeLayout>
-
-</androidx.cardview.widget.CardView>