| commit | 554b9879cc416b22c73d388d3d9488e6c3995361 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Mon Jul 19 12:24:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 19 12:24:00 2021 +0000 |
| tree | 108ee041ecef692543938d3be7be711ec29527f1 | |
| parent | d6b8146816f6fd62ae6d146336bfc30b248bced6 [diff] | |
| parent | 0841e93a342fefe6afe9fba4bd77933fb438d976 [diff] |
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
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 6e20398..4ebdbd8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -114,7 +114,13 @@ * 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; } /**