Don't rely on QuickstepLauncher instance for tests

Instead, bind to TouchInteractionService and use that binder to call into taskbar.

Test: TaplTestsTaskbar
Bug: 235986838
Change-Id: I222522bc53c9d1698542fbae52c37889f14abf41
This commit is contained in:
Tony Wickham committed 2022-08-29 17:27:27 -07:00
1 parent 7fb96a5305
commit b6f593042d
3 files changed
+45 -45

No files matched your search

@@ -25,12 +25,14 @@ import androidx.annotation.Nullable;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.taskbar.LauncherTaskbarUIController;
import com.android.launcher3.testing.DebugTestInformationHandler;
import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.quickstep.TouchInteractionService.TISBinder;
import com.android.quickstep.util.TISBindHelper;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
/**
* Class to handle requests from tests, including debug ones, to Quickstep Launcher builds.
@@ -49,29 +51,26 @@ public abstract class DebugQuickstepTestInformationHandler extends QuickstepTest
Bundle response = new Bundle();
switch (method) {
case TestProtocol.REQUEST_ENABLE_MANUAL_TASKBAR_STASHING:
runOnUIThread(l -> {
enableManualTaskbarStashing(l, true);
runOnTISBinder(tisBinder -> {
enableManualTaskbarStashing(tisBinder, true);
});
return response;
case TestProtocol.REQUEST_DISABLE_MANUAL_TASKBAR_STASHING:
runOnUIThread(l -> {
enableManualTaskbarStashing(l, false);
runOnTISBinder(tisBinder -> {
enableManualTaskbarStashing(tisBinder, false);
});
return response;
case TestProtocol.REQUEST_UNSTASH_TASKBAR_IF_STASHED:
runOnUIThread(l -> {
enableManualTaskbarStashing(l, true);
QuickstepLauncher quickstepLauncher = (QuickstepLauncher) l;
LauncherTaskbarUIController taskbarUIController =
quickstepLauncher.getTaskbarUIController();
runOnTISBinder(tisBinder -> {
enableManualTaskbarStashing(tisBinder, true);
// Allow null-pointer to catch illegal states.
taskbarUIController.unstashTaskbarIfStashed();
tisBinder.getTaskbarManager().getCurrentActivityContext()
.unstashTaskbarIfStashed();
enableManualTaskbarStashing(l, false);
enableManualTaskbarStashing(tisBinder, false);
});
return response;
@@ -89,24 +88,26 @@ public abstract class DebugQuickstepTestInformationHandler extends QuickstepTest
}
}
private void enableManualTaskbarStashing(Launcher launcher, boolean enable) {
QuickstepLauncher quickstepLauncher = (QuickstepLauncher) launcher;
LauncherTaskbarUIController taskbarUIController =
quickstepLauncher.getTaskbarUIController();
private void enableManualTaskbarStashing(TISBinder tisBinder, boolean enable) {
// Allow null-pointer to catch illegal states.
taskbarUIController.enableManualStashingForTests(enable);
tisBinder.getTaskbarManager().getCurrentActivityContext().enableManualStashingForTests(
enable);
}
/**
* Runs the given command on the UI thread.
* Runs the given command on the UI thread, after ensuring we are connected to
* TouchInteractionService.
*/
private static void runOnUIThread(UIThreadCommand command) {
private void runOnTISBinder(Consumer<TISBinder> connectionCallback) {
try {
MAIN_EXECUTOR.submit(() -> {
command.execute(Launcher.ACTIVITY_TRACKER.getCreatedActivity());
return null;
}).get();
CountDownLatch countDownLatch = new CountDownLatch(1);
TISBindHelper helper = MAIN_EXECUTOR.submit(() ->
new TISBindHelper(mContext, tisBinder -> {
connectionCallback.accept(tisBinder);
countDownLatch.countDown();
})).get();
countDownLatch.await();
MAIN_EXECUTOR.submit(helper::onDestroy);
} catch (ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
}