From fb999dc720f15f0eddf729d0ce197647913f6c9b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 27 Jul 2021 14:59:30 -0700
Subject: [PATCH] No NavigationBar layer in tablets

Fixes: 191660313
Test: adb shell dumpsys window

Change-Id: Ica9dca508dd377b3b687ef068b578723da62ba15
---
 .../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;
         }