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

Merge "Attach/Detatch EdgeBackGestureHandler only once on Taskbar init/destroy" into sc-v2-dev am: 8abc42e059

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888917

Change-Id: Idf245389e5ea7bade5e4d23e69ddd74d12ae60ec
This commit is contained in:
Vinit Nayak
2021-09-23 06:02:33 +00:00
committed by Automerger Merge Worker
parent 8a868c186a 8abc42e059
commit 92dc9fe98d
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
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);