From 9c84d7f3c3437f951bc3af3e86636ff0134a2185 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 15 Jul 2021 14:42:33 -1000 Subject: [PATCH] Don't allow stashing in tests for now Test: TaplTestsQuickstep#testOverviewActions (arbirarily) Bug: 193521974 Change-Id: Ic2c5c5f9f37ed3f035ec932b4c96fb51598cf899 --- .../android/launcher3/taskbar/TaskbarStashController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 6e20398174..4ebdbd8107 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -114,7 +114,13 @@ public class TaskbarStashController { * Returns whether the user can manually stash the taskbar based on the current device state. */ private boolean supportsStashing() { - return !mActivity.isThreeButtonNav(); + return !mActivity.isThreeButtonNav() + && (!Utilities.IS_RUNNING_IN_TEST_HARNESS || supportsStashingForTests()); + } + + private boolean supportsStashingForTests() { + // TODO: enable this for tests that specifically check stash/unstash behavior. + return false; } /**