From 2e8f00fca9eceb30466dadb41930d98e1701cbdc Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 10 May 2021 19:36:27 -0700
Subject: [PATCH] Prevent 3 button taskbar from showing on startup

Previously we were only hiding sysui navbar on
nav mode or config change, but the old navbar would
still show over taskbar if user was in three button mode
on device startup.

Bug: 180046394
Test: Restart device on gesture and 3 button nav.
Change-Id: I21169cb324f2a3e867424a3a494513f11ec96a0b
---
 .../systemui/navigationbar/NavigationBarController.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
index 9c3cb2e4604dc..ae9b5987bac51 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
@@ -184,6 +184,7 @@ public class NavigationBarController implements Callbacks,
         mNavMode = mNavigationModeController.addListener(this);
         mNavigationModeController.addListener(this);
         mTaskbarDelegate = new TaskbarDelegate(mOverviewProxyService);
+        mIsTablet = isTablet(mContext.getResources().getConfiguration());
     }
 
     @Override
@@ -297,6 +298,10 @@ public class NavigationBarController implements Callbacks,
      */
     public void createNavigationBars(final boolean includeDefaultDisplay,
             RegisterStatusBarResult result) {
+        if (updateNavbarForTaskbar()) {
+            return;
+        }
+
         Display[] displays = mDisplayManager.getDisplays();
         for (Display display : displays) {
             if (includeDefaultDisplay || display.getDisplayId() != DEFAULT_DISPLAY) {