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

Commit 0c4ee656 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Revert "No NavigationBar layer in tablets"" into sc-v2-dev am: 5214873a 

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

Change-Id: I6ac88f9f81b2b1e1e29ebff81f4449898e8fefda
parents 5c202c7f 5214873a

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

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


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

    private boolean initializeTaskbarIfNecessary() {

        if (mIsTablet) {

        boolean isShowingTaskbar = mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON;

        if (isShowingTaskbar) {

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

            removeNavigationBar(mContext.getDisplayId());

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

            mTaskbarDelegate.destroy();

        }

        return mIsTablet;

        return isShowingTaskbar;

    }



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

        }



        if (mIsTablet) {

        if (mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON) {

            return;

        }