diff options
3 files changed, 15 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegate.kt index cbece2cbb382..d2666006db92 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegate.kt @@ -28,6 +28,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dialog.ui.composable.AlertDialogContent import com.android.systemui.qs.panels.domain.interactor.EditTilesResetInteractor import com.android.systemui.res.R +import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor import com.android.systemui.statusbar.phone.ComponentSystemUIDialog import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.SystemUIDialogFactory @@ -40,6 +41,7 @@ class QSResetDialogDelegate @Inject constructor( private val sysuiDialogFactory: SystemUIDialogFactory, + private val shadeDialogContextInteractor: ShadeDialogContextInteractor, private val resetInteractor: EditTilesResetInteractor, ) : SystemUIDialog.Delegate { private var currentDialog: ComponentSystemUIDialog? = null @@ -53,7 +55,9 @@ constructor( currentDialog = sysuiDialogFactory - .create { ResetConfirmationDialog(it) } + .create(context = shadeDialogContextInteractor.context) { + ResetConfirmationDialog(it) + } .also { it.lifecycle.addObserver( object : DefaultLifecycleObserver { diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegateKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegateKosmos.kt index c58d55edd9e6..73d8dc6b48b5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegateKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/dialog/QSResetDialogDelegateKosmos.kt @@ -18,7 +18,14 @@ package com.android.systemui.qs.panels.ui.dialog import com.android.systemui.kosmos.Kosmos import com.android.systemui.qs.panels.domain.interactor.sizedTilesResetInteractor +import com.android.systemui.shade.data.repository.shadeDialogContextInteractor import com.android.systemui.statusbar.phone.systemUIDialogFactory val Kosmos.qsResetDialogDelegateKosmos by - Kosmos.Fixture { QSResetDialogDelegate(systemUIDialogFactory, sizedTilesResetInteractor) } + Kosmos.Fixture { + QSResetDialogDelegate( + systemUIDialogFactory, + shadeDialogContextInteractor, + sizedTilesResetInteractor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeAnimationRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeAnimationRepositoryKosmos.kt index 3ed730271bc3..e1ca86a03367 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeAnimationRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeAnimationRepositoryKosmos.kt @@ -18,12 +18,8 @@ package com.android.systemui.shade.data.repository import android.content.applicationContext import com.android.systemui.kosmos.Kosmos -import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor -import org.mockito.kotlin.doReturn -import org.mockito.kotlin.mock +import com.android.systemui.shade.domain.interactor.FakeShadeDialogContextInteractor val Kosmos.shadeAnimationRepository by Kosmos.Fixture { ShadeAnimationRepository() } val Kosmos.shadeDialogContextInteractor by - Kosmos.Fixture { - mock<ShadeDialogContextInteractor> { on { context } doReturn applicationContext } - } + Kosmos.Fixture { FakeShadeDialogContextInteractor(applicationContext) } |