Merge "Update edgeBackGestureHandler for Taskbar on init/destroy()" into sc-v2-dev am: bf0ee05d8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872267 Change-Id: I820fea0468a564ebc0147c39acfe900a7fe970af
This commit is contained in:
@@ -71,6 +71,7 @@ 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) {
|
||||
@@ -96,6 +97,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
|
||||
mOverviewProxyService.removeCallback(this);
|
||||
mNavigationModeController.removeListener(this);
|
||||
mNavigationBarA11yHelper.removeA11yEventListener(mNavA11yEventListener);
|
||||
mEdgeBackGestureHandler.onNavBarDetached();
|
||||
mTaskbarVisible = false;
|
||||
}
|
||||
|
||||
public void init(int displayId) {
|
||||
@@ -105,6 +108,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
|
||||
mEdgeBackGestureHandler.onNavigationModeChanged(
|
||||
mNavigationModeController.addListener(this));
|
||||
mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener);
|
||||
mEdgeBackGestureHandler.onNavBarAttached();
|
||||
mTaskbarVisible = true;
|
||||
// Set initial state for any listeners
|
||||
updateSysuiFlags();
|
||||
}
|
||||
@@ -181,6 +186,10 @@ 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 {
|
||||
|
||||
Reference in New Issue
Block a user