Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update edgeBackGestureHandler for Taskbar on init/destroy()" into sc-v2-dev

Browse Source
This commit is contained in:
Vinit Nayak
2021-09-20 22:52:19 +00:00
committed by Android (Google) Code Review
parent 8ad71b1731 d6bb344225
commit bf0ee05d8a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
View File

@@ -71,6 +71,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
private int mDisabledFlags; private int mDisabledFlags;
private @WindowVisibleState int mTaskBarWindowState = WINDOW_STATE_SHOWING; private @WindowVisibleState int mTaskBarWindowState = WINDOW_STATE_SHOWING;
private @Behavior int mBehavior; private @Behavior int mBehavior;
private boolean mTaskbarVisible = false;
@Inject @Inject
public TaskbarDelegate(Context context) { public TaskbarDelegate(Context context) {
@@ -96,6 +97,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
mOverviewProxyService.removeCallback(this); mOverviewProxyService.removeCallback(this);
mNavigationModeController.removeListener(this); mNavigationModeController.removeListener(this);
mNavigationBarA11yHelper.removeA11yEventListener(mNavA11yEventListener); mNavigationBarA11yHelper.removeA11yEventListener(mNavA11yEventListener);
mEdgeBackGestureHandler.onNavBarDetached();
mTaskbarVisible = false;
} }
public void init(int displayId) { public void init(int displayId) {
@@ -105,6 +108,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
mEdgeBackGestureHandler.onNavigationModeChanged( mEdgeBackGestureHandler.onNavigationModeChanged(
mNavigationModeController.addListener(this)); mNavigationModeController.addListener(this));
mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener); mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener);
mEdgeBackGestureHandler.onNavBarAttached();
mTaskbarVisible = true;
// Set initial state for any listeners // Set initial state for any listeners
updateSysuiFlags(); updateSysuiFlags();
} }
@@ -181,6 +186,10 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
@Override @Override
public void onTaskbarStatusUpdated(boolean visible, boolean stashed) { public void onTaskbarStatusUpdated(boolean visible, boolean stashed) {
if (mTaskbarVisible == visible) {
return;
}
mTaskbarVisible = visible;
if (visible) { if (visible) {
mEdgeBackGestureHandler.onNavBarAttached(); mEdgeBackGestureHandler.onNavBarAttached();
} else { } else {