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

Commit ff74bd5b authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "No NavigationBar layer in tablets""" into sc-v2-dev am: 3d9545ef 

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

Change-Id: Ieaa4ee6141a6f34986a0b6846211d2462b84b574
parents 90c87518 3d9545ef

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

+3 −4
Original line number Diff line number Diff line
@@ -251,8 +251,7 @@ public class NavigationBarController implements Callbacks, 


    /** @return {@code true} if taskbar is enabled, false otherwise */

    private boolean initializeTaskbarIfNecessary() {

        boolean isShowingTaskbar = mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON;

        if (isShowingTaskbar) {

        if (mIsTablet) {

            // Remove navigation bar when taskbar is showing, currently only for 3 button mode

            removeNavigationBar(mContext.getDisplayId());

            mCommandQueue.addCallback(mTaskbarDelegate);
@@ -261,7 +260,7 @@ public class NavigationBarController implements Callbacks, 
            mCommandQueue.removeCallback(mTaskbarDelegate);

            mTaskbarDelegate.destroy();

        }

        return isShowingTaskbar;

        return mIsTablet;

    }



    @Override
@@ -332,7 +331,7 @@ public class NavigationBarController implements Callbacks, 
            return;

        }



        if (mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON) {

        if (mIsTablet) {

            return;

        }