Merge pull request #3626 from mozilla-mobile/mergify/bp/releases_v118/pr-3622

Bug 1852984 - Show the right theme for the extensions process crash dialog (backport #3622)

app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt

@@ -4,9 +4,9 @@
 
 package org.mozilla.fenix.addons
 
-import android.app.AlertDialog
 import android.content.Context
 import androidx.annotation.UiContext
+import androidx.appcompat.app.AlertDialog
 import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupAction
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.Engine
@@ -70,7 +70,7 @@ class ExtensionProcessDisabledController(
     @UiContext context: Context,
     store: BrowserStore,
     engine: Engine = context.components.core.engine,
-    builder: AlertDialog.Builder = AlertDialog.Builder(context, R.style.DialogStyleNormal),
+    builder: AlertDialog.Builder = AlertDialog.Builder(context),
     appName: String = context.appName,
 ) : ExtensionProcessDisabledPopupFeature(
     store,

app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt

@@ -4,9 +4,9 @@
 
 package org.mozilla.fenix.addons
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface.OnClickListener
+import androidx.appcompat.app.AlertDialog
 import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupAction
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.Engine