From 1e164d4a874a606d624e789cb1b3c6e4b4cee7f9 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Mon, 8 Aug 2022 10:35:42 +0800 Subject: [PATCH] Fix multi-display nav bar tests on large screen devices Tests failed because #createnavigationBar skip create nav bar even on the secondary display if there's a task bar initialized. This CL changes to only check on the default display instead. fixes: 241509471 Test: atest MultiDisplaySystemDecorationTests#testNavBarShowingOnDisplayWithDecor Test: atest MultiDisplaySystemDecorationTests#testNavBarNotShowingOnDisplayWithoutDecor Test: atest MultiDisplaySystemDecorationTests#testNavBarNotShowingOnPrivateDisplay Change-Id: Ibdd5fb65a92915ac92e908c0091260573cec18c8 --- .../systemui/navigationbar/NavigationBarController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index 2d7a809644c04..3789cbb1fb651 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -302,10 +302,6 @@ public class NavigationBarController implements */ @VisibleForTesting void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) { - if (initializeTaskbarIfNecessary()) { - return; - } - if (display == null) { return; } @@ -315,7 +311,7 @@ public class NavigationBarController implements // We may show TaskBar on the default display for large screen device. Don't need to create // navigation bar for this case. - if (mIsTablet && isOnDefaultDisplay) { + if (isOnDefaultDisplay && initializeTaskbarIfNecessary()) { return; }