Merge "Attach/Detatch EdgeBackGestureHandler only once on Taskbar init/destroy" into sc-v2-dev (8abc42e0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -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);