From 6269ac83c5624608eeea98aba8b3036ee1e6a85d Mon Sep 17 00:00:00 2001 From: Alex Florescu Date: Thu, 5 Aug 2021 18:41:59 +0100 Subject: [PATCH] Fix test when running on large screen devices Fixes: 195651761 Test: atest SystemUITests:NavigationBarControllerTest Change-Id: I3e148c9bba5d980c05f01e720e411eeb4473c66a --- .../android/systemui/navigationbar/NavigationBarController.java | 2 +- .../systemui/navigationbar/NavigationBarControllerTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index 543004eecb8ed..1ca2217638f78 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -116,7 +116,7 @@ public class NavigationBarController implements Callbacks, private final TaskbarDelegate mTaskbarDelegate; private final NotificationShadeDepthController mNotificationShadeDepthController; private int mNavMode; - private boolean mIsTablet; + @VisibleForTesting boolean mIsTablet; private final UserTracker mUserTracker; /** A displayId - nav bar maps. */ diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java index 8fd2a329a33e5..3ea57be98be0b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java @@ -142,6 +142,8 @@ public class NavigationBarControllerTest extends SysuiTestCase { @Test public void testCreateNavigationBarsIncludeDefaultTrue() { + // Tablets may be using taskbar and the logic is different + mNavigationBarController.mIsTablet = false; doNothing().when(mNavigationBarController).createNavigationBar(any(), any(), any()); mNavigationBarController.createNavigationBars(true, null);