From f6660012cad9fd1e20baaabed7c2e269b9fc008c Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Wed, 13 Sep 2023 11:34:21 -0400 Subject: [PATCH] Bug 1852984 - Show the right theme for the extensions process crash dialog. (cherry picked from commit 33bc7626ac197e4fce32c32f1e23dae3fde17e9a) --- .../fenix/addons/ExtensionProcessDisabledController.kt | 4 ++-- .../fenix/addons/ExtensionProcessDisabledControllerTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt b/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt index b2b5c6a2ca..2f819b342e 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt +++ b/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, diff --git a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt b/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt index fd85f5a541..e0825ebbc5 100644 --- a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt +++ b/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