From 5d49fdf8d61901efa5bfbccf32d5609c04d9f206 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Fri, 13 Aug 2021 07:39:58 +0000 Subject: [PATCH] Revert "Revert "No NavigationBar layer in tablets"" This reverts commit a7a5ad7b7888d0e5ea6087f5e7aae04774335d4a. Reason for revert: Reapply the change with additional changes to fix tapl tests Bug: 191660313 Test: TaplTestsLauncher3 Change-Id: I67f0c6780cb7b531b8d88824786e8d7875256b7e --- .../systemui/navigationbar/NavigationBarController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index 543004eecb8ed..97cd29df5ab43 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -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; }