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
This commit is contained in:
Vinit Nayak
2021-09-22 10:46:46 -07:00
parent 212fc8b3dc
commit 86773c5342

View File

@@ -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);