Merge "Revert "Call setOverviewDragState() whenever taskbar is recreated"" into main (a47eff5e) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+8 −18

Original line number	Diff line number	Diff line
		@@ -205,7 +205,13 @@ public class TaskbarLauncherStateController {
		mLauncherState = finalState;
		updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false);
		applyState();
		updateOverviewDragState(finalState);
		boolean disallowLongClick =
		FeatureFlags.enableSplitContextually()
		? mLauncher.isSplitSelectionActive()
		: finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
		com.android.launcher3.taskbar.Utilities.setOverviewDragState(
		mControllers, finalState.disallowTaskbarGlobalDrag(),
		disallowLongClick, finalState.allowTaskbarInitialSplitSelection());
		}
		};

		@@ -250,7 +256,6 @@ public class TaskbarLauncherStateController {

		mCanSyncViews = true;
		mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
		updateOverviewDragState(mLauncherState);
		}

		public void onDestroy() {
		@@ -352,21 +357,6 @@ public class TaskbarLauncherStateController {
		}
		}

		/**
		* Updates overview drag state on various controllers based on {@link #mLauncherState}.
		*
		* @param launcherState The current state launcher is in
		*/
		private void updateOverviewDragState(LauncherState launcherState) {
		boolean disallowLongClick =
		FeatureFlags.enableSplitContextually()
		? mLauncher.isSplitSelectionActive()
		: launcherState == LauncherState.OVERVIEW_SPLIT_SELECT;
		com.android.launcher3.taskbar.Utilities.setOverviewDragState(
		mControllers, launcherState.disallowTaskbarGlobalDrag(),
		disallowLongClick, launcherState.allowTaskbarInitialSplitSelection());
		}

		/**
		* Updates the proper flag to change the state of the task bar.
		*