From 633f9336210d17a86a55e191eff7261ee43c2f56 Mon Sep 17 00:00:00 2001
From: Dhina17 <dhinalogu@gmail.com>
Date: Tue, 4 Jun 2024 17:14:19 +0530
Subject: [PATCH] fixup! Revert "Remove "Device Controls" from Settings"
Change-Id: I8cd0cb349f49e93f8e1da90a4fbb3c0a58e1c9b5
---
.../domain/autoaddable/DeviceControlsAutoAddableTest.kt | 4 ++--
.../controls/controller/ControlsControllerImplTest.kt | 4 ++++
.../android/systemui/statusbar/phone/AutoTileManagerTest.java | 4 ++--
.../statusbar/policy/DeviceControlsControllerImplTest.kt | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddableTest.kt
index 0116bd9575d8..a31db9f26f35 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddableTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddableTest.kt
@@ -70,7 +70,7 @@ class DeviceControlsAutoAddableTest : SysuiTestCase() {
runCurrent()
verify(deviceControlsController).setCallback(capture(callbackCaptor))
- callbackCaptor.value.onControlsUpdate(position)
+ callbackCaptor.value.onControlsAvailable(position)
assertThat(signal).isEqualTo(AutoAddSignal.Add(SPEC, position))
verify(deviceControlsController).removeCallback()
@@ -82,7 +82,7 @@ class DeviceControlsAutoAddableTest : SysuiTestCase() {
runCurrent()
verify(deviceControlsController).setCallback(capture(callbackCaptor))
- callbackCaptor.value.onControlsUpdate(null)
+ callbackCaptor.value.onControlsAvailable(0)
assertThat(signal).isNull()
verify(deviceControlsController).removeCallback()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsControllerImplTest.kt
index 07f5bf2b010f..59c40e485622 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsControllerImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsControllerImplTest.kt
@@ -17,6 +17,7 @@
package com.android.systemui.controls.controller
import android.app.PendingIntent
+import android.content.BroadcastReceiver
import android.content.ComponentName
import android.content.Context
import android.content.ContextWrapper
@@ -147,6 +148,9 @@ class ControlsControllerImplTest : SysuiTestCase() {
private val user = mContext.userId
private val otherUser = user + 1
+ @Captor
+ private lateinit var broadcastReceiverCaptor: ArgumentCaptor<BroadcastReceiver>
+
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java
index 84cd518cf85a..b725f8bf9a3e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java
@@ -566,7 +566,7 @@ public class AutoTileManagerTest extends SysuiTestCase {
verify(mDeviceControlsController).setCallback(captor.capture());
- captor.getValue().onControlsUpdate(3);
+ captor.getValue().onControlsAvailable(3);
verify(mQsHost).addTile(spec, 3);
verify(mAutoAddTracker).setTileAdded(spec);
}
@@ -603,7 +603,7 @@ public class AutoTileManagerTest extends SysuiTestCase {
verify(mDeviceControlsController).setCallback(captor.capture());
- captor.getValue().onControlsUpdate(3);
+ captor.getValue().onControlsAvailable(3);
verify(mQsHost, never()).addTile(spec, 3);
verify(mAutoAddTracker, never()).setTileAdded(spec);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt
index 1703525b0fdf..1fc250483a09 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt
@@ -163,6 +163,6 @@ class DeviceControlsControllerImplTest : SysuiTestCase() {
controller.setCallback(callback)
verify(callback).removeControlsAutoTracker()
- verify(callback, never()).onControlsUpdate(anyInt())
+ verify(callback, never()).onControlsAvailable(anyInt())
}
}
--
GitLab