From c138bf3305759990f4a1d4113748b900e218b2da Mon Sep 17 00:00:00 2001
From: Dhina17 <dhinalogu@gmail.com>
Date: Tue, 4 Jun 2024 19:24:25 +0530
Subject: [PATCH] fixup! Revert "Controls in QS"
Change-Id: Icc91ebc2f44d1d17cb7d28996cf82bc5128042e9
---
.../controls/controller/ControlActionCoordinatorImplTest.kt | 4 ++++
.../controls/management/ControlsEditingActivityTest.kt | 3 +++
.../controls/management/ControlsFavoritingActivityTest.kt | 3 +++
.../management/ControlsProviderSelectorActivityTest.kt | 6 +++++-
.../systemui/controls/ui/PanelTaskViewControllerTest.kt | 4 ++--
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt
index a3753269fa8c..d8ce99064802 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt
@@ -24,6 +24,7 @@ import com.android.systemui.broadcast.BroadcastSender
import com.android.systemui.controls.ControlsMetricsLogger
import com.android.systemui.controls.settings.ControlsSettingsDialogManager
import com.android.systemui.controls.settings.FakeControlsSettingsRepository
+import com.android.systemui.globalactions.GlobalActionsComponent
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.statusbar.VibratorHelper
import com.android.systemui.statusbar.policy.KeyguardStateController
@@ -70,6 +71,8 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() {
private lateinit var metricsLogger: ControlsMetricsLogger
@Mock
private lateinit var controlsSettingsDialogManager: ControlsSettingsDialogManager
+ @Mock
+ private lateinit var globalActionsComponent: GlobalActionsComponent
companion object {
fun <T> any(): T = Mockito.any<T>()
@@ -100,6 +103,7 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() {
metricsLogger,
vibratorHelper,
controlsSettingsRepository,
+ globalActionsComponent,
))
coordinator.activityContext = mContext
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsEditingActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsEditingActivityTest.kt
index 2a4524b971a4..9ab11c38e788 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsEditingActivityTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsEditingActivityTest.kt
@@ -18,6 +18,7 @@ import com.android.systemui.controls.CustomIconCache
import com.android.systemui.controls.controller.ControlsControllerImpl
import com.android.systemui.settings.UserTracker
import com.android.systemui.util.concurrency.FakeExecutor
+import com.android.systemui.util.mockito.mock
import com.android.systemui.util.time.FakeSystemClock
import com.google.common.truth.Truth.assertThat
import java.util.concurrent.CountDownLatch
@@ -171,6 +172,8 @@ class ControlsEditingActivityTest : SysuiTestCase() {
controller,
userTracker,
customIconCache,
+ mock(),
+ mock(),
) {
var startActivityData: StartActivityData? = null
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
index 88d36af71958..b7b87645ab8a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
@@ -25,6 +25,7 @@ import com.android.systemui.flags.FakeFeatureFlags
import com.android.systemui.settings.UserTracker
import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.capture
+import com.android.systemui.util.mockito.mock
import com.android.systemui.util.mockito.whenever
import com.google.common.truth.Truth.assertThat
import com.google.common.util.concurrent.MoreExecutors
@@ -189,6 +190,8 @@ class ControlsFavoritingActivityTest : SysuiTestCase() {
executor,
controller,
userTracker,
+ mock(),
+ mock(),
) {
var triedToFinish = false
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt
index d17495f21a68..6640da37acdb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt
@@ -34,7 +34,9 @@ import com.android.systemui.activity.SingleActivityFactory
import com.android.systemui.controls.ControlsServiceInfo
import com.android.systemui.controls.controller.ControlsController
import com.android.systemui.controls.panels.AuthorizedPanelsRepository
+import com.android.systemui.controls.ui.ControlsUiController
import com.android.systemui.controls.ui.SelectedItem
+import com.android.systemui.globalactions.GlobalActionsComponent
import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.settings.UserTracker
@@ -236,7 +238,9 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() {
controlsController,
userTracker,
authorizedPanelsRepository,
- dialogFactory
+ dialogFactory,
+ mock(),
+ mock(),
) {
var lastStartedActivity: Intent? = null
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/PanelTaskViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/PanelTaskViewControllerTest.kt
index d56b2abe2b9d..40c682892f56 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/PanelTaskViewControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/PanelTaskViewControllerTest.kt
@@ -76,13 +76,13 @@ class PanelTaskViewControllerTest : SysuiTestCase() {
uiExecutor.execute(it.arguments[0] as Runnable)
true
}
- whenever(activityContext.resources).thenReturn(context.resources)
+ whenever(activityContext!!.resources).thenReturn(context.resources)
uiExecutor = FakeExecutor(FakeSystemClock())
underTest =
PanelTaskViewController(
- activityContext,
+ activityContext!!,
uiExecutor,
pendingIntent,
taskView,
--
GitLab