From 86773c5342de9e2b954c80c49366746c7afcbdde Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 22 Sep 2021 10:46:46 -0700
Subject: [PATCH] Attach/Detatch EdgeBackGestureHandler only once on Taskbar
 init/destroy

Bug: 197058461
Test: Back works in app, and on launcher (all apps/overview)
Change-Id: I81f6d649454fdf2164675b86849969425e46f63a
---
 .../systemui/navigationbar/TaskbarDelegate.java  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
index 0e32e9d0b5264..71d2a73c73f6b 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
@@ -71,7 +71,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
     private int mDisabledFlags;
     private @WindowVisibleState int mTaskBarWindowState = WINDOW_STATE_SHOWING;
     private @Behavior int mBehavior;
-    private boolean mTaskbarVisible = false;
 
     @Inject
     public TaskbarDelegate(Context context) {
@@ -98,7 +97,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
         mNavigationModeController.removeListener(this);
         mNavigationBarA11yHelper.removeA11yEventListener(mNavA11yEventListener);
         mEdgeBackGestureHandler.onNavBarDetached();
-        mTaskbarVisible = false;
     }
 
     public void init(int displayId) {
@@ -109,7 +107,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
                 mNavigationModeController.addListener(this));
         mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener);
         mEdgeBackGestureHandler.onNavBarAttached();
-        mTaskbarVisible = true;
         // Set initial state for any listeners
         updateSysuiFlags();
     }
@@ -184,19 +181,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
         }
     }
 
-    @Override
-    public void onTaskbarStatusUpdated(boolean visible, boolean stashed) {
-        if (mTaskbarVisible == visible) {
-            return;
-        }
-        mTaskbarVisible = visible;
-        if (visible) {
-            mEdgeBackGestureHandler.onNavBarAttached();
-        } else {
-            mEdgeBackGestureHandler.onNavBarDetached();
-        }
-    }
-
     @Override
     public void onNavigationModeChanged(int mode) {
         mEdgeBackGestureHandler.onNavigationModeChanged(mode);