Merge "Prevent 3 button taskbar from showing on startup" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-05-13 19:57:28 +00:00
committed by Android (Google) Code Review

View File

@@ -184,6 +184,7 @@ public class NavigationBarController implements Callbacks,
mNavMode = mNavigationModeController.addListener(this); mNavMode = mNavigationModeController.addListener(this);
mNavigationModeController.addListener(this); mNavigationModeController.addListener(this);
mTaskbarDelegate = new TaskbarDelegate(mOverviewProxyService); mTaskbarDelegate = new TaskbarDelegate(mOverviewProxyService);
mIsTablet = isTablet(mContext.getResources().getConfiguration());
} }
@Override @Override
@@ -297,6 +298,10 @@ public class NavigationBarController implements Callbacks,
*/ */
public void createNavigationBars(final boolean includeDefaultDisplay, public void createNavigationBars(final boolean includeDefaultDisplay,
RegisterStatusBarResult result) { RegisterStatusBarResult result) {
if (updateNavbarForTaskbar()) {
return;
}
Display[] displays = mDisplayManager.getDisplays(); Display[] displays = mDisplayManager.getDisplays();
for (Display display : displays) { for (Display display : displays) {
if (includeDefaultDisplay || display.getDisplayId() != DEFAULT_DISPLAY) { if (includeDefaultDisplay || display.getDisplayId() != DEFAULT_DISPLAY) {