From 209727f64bb46cadebf8a7dc867635f701371349 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 17 Sep 2021 18:10:46 +0100
Subject: [PATCH] Set navigation mode when taskbar is initialised.

Without this, EdgeBackGestureHandler doesn't know that gesture nav is
enabled until you toggle the setting explicitly.

Bug: 198639199
Test: Manual
Change-Id: Ie732469726318a335401a13f68083256f5b9a231
---
 .../com/android/systemui/navigationbar/TaskbarDelegate.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
index ecc3245e286ab..fc377c374f531 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
@@ -102,7 +102,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
         mDisplayId = displayId;
         mCommandQueue.addCallback(this);
         mOverviewProxyService.addCallback(this);
-        mNavigationModeController.addListener(this);
+        mEdgeBackGestureHandler.onNavigationModeChanged(
+                mNavigationModeController.addListener(this));
         mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener);
         // Set initial state for any listeners
         updateSysuiFlags();