| commit | c2bb120a8752fd1c826b1e4e2a88a2eb40cc03c1 | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Wed Jun 26 14:50:54 2024 -0400 |
| committer | Brian Isganitis <brianji@google.com> | Thu Jun 27 18:32:26 2024 -0400 |
| tree | c252f8e7232f28098a9dd29af63add4cc0bee5bc | |
| parent | e7e98985f7bc8142787a22129145105f56303cf0 [diff] |
Have recreateTaskbar perform recreate on UiThread.
Test: Taskbar{AllApps,Overlay}ControllerTest
Bug: 230027385
Flag: TEST_ONLY
Change-Id: I663e5ad7bb37e73381e2ef9d787c80177cfdf7a7
diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt index 2d7e751..adda51c 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt
@@ -65,9 +65,8 @@ } @Test - @UiThreadTest fun testToggle_taskbarRecreated_allAppsReopened() { - allAppsController.toggle() + getInstrumentation().runOnMainSync { allAppsController.toggle() } taskbarUnitTestRule.recreateTaskbar() assertThat(allAppsController.isOpen).isTrue() }
diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt index 494499a..4f83ac0 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt
@@ -150,9 +150,10 @@ } @Test - @UiThreadTest fun testRecreateTaskbar_closesWindow() { - TestOverlayView.show(overlayController.requestWindow()) + getInstrumentation().runOnMainSync { + TestOverlayView.show(overlayController.requestWindow()) + } taskbarUnitTestRule.recreateTaskbar() assertThat(hasOpenView(taskbarContext, TYPE_TASKBAR_OVERLAY_PROXY)).isFalse() }
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 9f9a37b..88df029 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
@@ -135,7 +135,7 @@ /** Simulates Taskbar recreation lifecycle. */ fun recreateTaskbar() { - taskbarManager.recreateTaskbar() + instrumentation.runOnMainSync { taskbarManager.recreateTaskbar() } injectControllers() }