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

Commit 5d49fdf8 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Revert "Revert "No NavigationBar layer in tablets"" 

This reverts commit a7a5ad7b.

Reason for revert: Reapply the change with additional changes to fix tapl tests

Bug: 191660313
Test: TaplTestsLauncher3
Change-Id: I67f0c6780cb7b531b8d88824786e8d7875256b7e
parent a7a5ad7b

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;

        }