Merge "Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar" into tm-qpr-dev am: 788f8e09fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20666524 Change-Id: Id1c71be116afa8bb77bb2213064939ea34f86d1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -131,7 +131,10 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
|
||||
* Returns whether taskbar is transient.
|
||||
*/
|
||||
public static boolean isTransientTaskbar(Context context) {
|
||||
if (FORCE_PERSISTENT_TASKBAR.get()) {
|
||||
// TODO(b/258604917): When running in test harness, use !sTransientTaskbarStatusForTests
|
||||
// once tests are updated to expect new persistent behavior such as not allowing long press
|
||||
// to stash.
|
||||
if (!Utilities.IS_RUNNING_IN_TEST_HARNESS && FORCE_PERSISTENT_TASKBAR.get()) {
|
||||
return false;
|
||||
}
|
||||
return getNavigationMode(context) == NavigationMode.NO_BUTTON
|
||||
|
||||
Reference in New Issue
Block a user