diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt index 441e571523..4d84fd5002 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarSandboxComponent.kt @@ -109,7 +109,18 @@ constructor( ) : DisplayController(context, wmProxy, prefs, lifecycle) { var infoModifier: ((Info) -> Info)? = null - var infoModifierForDisplay: ((Info?) -> Info?)? = null + + // When overview on CD is enabled, DisplayController queries getInfoForDisplay instead of + // getInfo for the primary (virtual) display used in tests. So, override it to get info from the + // default display. + private val defaultInfoModifierForDisplay: ((Info?) -> Info?)? = + if (Flags.enableOverviewOnConnectedDisplays()) { + { _ -> info } + } else { + null + } + + var infoModifierForDisplay: ((Info?) -> Info?)? = defaultInfoModifierForDisplay private var prefListener: LauncherPrefChangeListener? = null @@ -143,8 +154,10 @@ constructor( .also { prefs.addListener(it, TASKBAR_PINNING) } } - fun removeTaskbarPinningPrefListener() { + fun cleanup() { prefListener?.let { prefs.removeListener(it, TASKBAR_PINNING) } + infoModifier = null + infoModifierForDisplay = defaultInfoModifierForDisplay } } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt index 906103fed3..72e3251358 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt @@ -166,7 +166,7 @@ class TaskbarUnitTestRule( base.evaluate() } finally { instrumentation.runOnMainSync { taskbarManager.destroy() } - context.displayControllerSpy?.removeTaskbarPinningPrefListener() + context.displayControllerSpy?.cleanup() } } }