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

Commit e0a893e6 authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Android Build Coastguard Worker
Browse files

Remove navbar from CD 

- Navbar is already removed for default display as it's functionality has moved to Taskbar.

Fix: 440416443
Flag: EXEMPT BUGFIX
Test: tested CUJs manually
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:f2e43550daa4ad5406f74bbe8e68864e7e3a2c4e
Merged-In: I4d6e584db596a6731d721176aabce22ae99f0a83
Change-Id: I4d6e584db596a6731d721176aabce22ae99f0a83
parent a43f785c

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

+8 −5
Original line number Diff line number Diff line
@@ -415,17 +415,20 @@ public class NavigationBarControllerImpl implements 
            return;

        }



        // Taskbar on connected displays will be created by TaskbarManager through display

        // decoration callback.

        if (!isOnDefaultDisplay) {

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

        if (initializeTaskbarIfNecessary()) {

            return;

        }



        final Context context = isOnDefaultDisplay

                ? mContext

                : mContext.createDisplayContext(display);

        NavigationBarComponent component = mNavigationBarComponentFactory.create(

                context, savedState);

                mContext, savedState);

        NavigationBar navBar = component.getNavigationBar();

        navBar.init();

        mNavigationBars.put(displayId, navBar);