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

Commit 78192289 authored by Qijing Yao's avatar Qijing Yao Committed by Automerger Merge Worker
Browse files

Merge "Allow using config to disable creation of navBar and taskBar" into udc-dev am: b534a8d4 

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



Change-Id: Ide0117ddad8941152c424aeee8d5391275a7dab5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1dd73cad b534a8d4

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

+18 −13
Original line number Diff line number Diff line
@@ -226,6 +226,18 @@ public class NavigationBarController implements 
        }

    }



    private boolean shouldCreateNavBarAndTaskBar(int displayId) {

        final IWindowManager wms = WindowManagerGlobal.getWindowManagerService();



        try {

            return wms.hasNavigationBar(displayId);

        } catch (RemoteException e) {

            // Cannot get wms, just return false with warning message.

            Log.w(TAG, "Cannot get WindowManager.");

            return false;

        }

    }



    /** @see #initializeTaskbarIfNecessary() */

    private boolean updateNavbarForTaskbar() {

        boolean taskbarShown = initializeTaskbarIfNecessary();
@@ -238,8 +250,8 @@ public class NavigationBarController implements 
    /** @return {@code true} if taskbar is enabled, false otherwise */

    private boolean initializeTaskbarIfNecessary() {

        // Enable for large screens or (phone AND flag is set); assuming phone = !mIsLargeScreen

        boolean taskbarEnabled = mIsLargeScreen || mFeatureFlags.isEnabled(

                Flags.HIDE_NAVBAR_WINDOW);

        boolean taskbarEnabled = (mIsLargeScreen || mFeatureFlags.isEnabled(

                Flags.HIDE_NAVBAR_WINDOW)) && shouldCreateNavBarAndTaskBar(mContext.getDisplayId());



        if (taskbarEnabled) {

            Trace.beginSection("NavigationBarController#initializeTaskbarIfNecessary");
@@ -331,23 +343,16 @@ public class NavigationBarController implements 
        final int displayId = display.getDisplayId();

        final boolean isOnDefaultDisplay = displayId == mDisplayTracker.getDefaultDisplayId();



        if (!shouldCreateNavBarAndTaskBar(displayId)) {

            return;

        }



        // We may show TaskBar on the default display for large screen device. Don't need to create

        // navigation bar for this case.

        if (isOnDefaultDisplay && initializeTaskbarIfNecessary()) {

            return;

        }



        final IWindowManager wms = WindowManagerGlobal.getWindowManagerService();



        try {

            if (!wms.hasNavigationBar(displayId)) {

                return;

            }

        } catch (RemoteException e) {

            // Cannot get wms, just return with warning message.

            Log.w(TAG, "Cannot get WindowManager.");

            return;

        }

        final Context context = isOnDefaultDisplay

                ? mContext

                : mContext.createDisplayContext(display);