Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 930416cb authored by Charles Chen's avatar Charles Chen
Browse files

Show nav bar on secondary displays regardless of 

... that TaskBar shows on the default display

Test: `atest MultiDisplaySystemDecorationTests` on large screen devices
Test: manual: simulate secondarydisplay + force desktop mode and check
      if nav bar shows on simulated display.
Bug: 205496049
Change-Id: I1736fbfd0f77a9fd3f07dd2fc725d99b397141c6
parent a5d5b319

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+10 −8
Original line number Diff line number Diff line
@@ -222,13 +222,12 @@ public class NavigationBarController implements 
     */

    public void createNavigationBars(final boolean includeDefaultDisplay,

            RegisterStatusBarResult result) {

        if (initializeTaskbarIfNecessary()) {

            return;

        }



        // Don't need to create nav bar on the default display if we initialize TaskBar.

        final boolean shouldCreateDefaultNavbar = includeDefaultDisplay

                && !initializeTaskbarIfNecessary();

        Display[] displays = mDisplayManager.getDisplays();

        for (Display display : displays) {

            if (includeDefaultDisplay || display.getDisplayId() != DEFAULT_DISPLAY) {

            if (shouldCreateDefaultNavbar || display.getDisplayId() != DEFAULT_DISPLAY) {

                createNavigationBar(display, null /* savedState */, result);

            }

        }
@@ -246,12 +245,15 @@ public class NavigationBarController implements 
            return;

        }



        if (mIsTablet) {

        final int displayId = display.getDisplayId();

        final boolean isOnDefaultDisplay = displayId == DEFAULT_DISPLAY;



        // 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) {

            return;

        }



        final int displayId = display.getDisplayId();

        final boolean isOnDefaultDisplay = displayId == DEFAULT_DISPLAY;

        final IWindowManager wms = WindowManagerGlobal.getWindowManagerService();



        try {