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

Commit f543d854 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Show nav bar on secondary displays regardless of" into sc-v2-dev am: ee998ebc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211956

Change-Id: Ic53b1e26ee32eda9940f878316ec0141edce92a2
parents c4508d88 ee998ebc

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 {