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

Commit 407944f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "No NavigationBar layer in tablets" into sc-v2-dev am: 0c2bfaca am: b0183557 

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

Change-Id: Id3189c7d14d85d8ece1329921f055b23a83fe116
parents a7b94c87 b0183557

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;

        }