Merge "Don't allow stashing in tests for now" into sc-v2-dev am: 0841e93a34

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15305566

Change-Id: Iecbc428f515b5e1725d0ec1b1368abadcb191286
This commit is contained in:
Alex Chau
2021-07-19 12:24:00 +00:00
committed by Automerger Merge Worker
@@ -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;
}
/**