Merge "Fix issue with global drag from taskbar being disabled" into tm-qpr-dev (d30ef726) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.launcher3.anim.AnimatedFloat;
		import com.android.launcher3.anim.AnimatorListeners;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.uioverrides.QuickstepLauncher;
		import com.android.launcher3.uioverrides.states.OverviewState;
		import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;
		import com.android.launcher3.util.window.RefreshRateTracker;
		import com.android.quickstep.RecentsAnimationCallbacks;
		@@ -119,11 +118,10 @@ import java.util.StringJoiner;
		mLauncherState = finalState;
		updateStateForFlag(FLAG_TRANSITION_STATE_RUNNING, false);
		applyState();
		boolean finalStateOverview = finalState instanceof OverviewState;
		boolean disallowLongClick = finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
		com.android.launcher3.taskbar.Utilities.setOverviewDragState(
		mControllers, finalStateOverview /disallowGlobalDrag/,
		disallowLongClick, finalStateOverview /allowInitialSplitSelection/);
		mControllers, finalState.disallowTaskbarGlobalDrag(),
		disallowLongClick, finalState.allowTaskbarInitialSplitSelection());
		}
		};

+12 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,18 @@ public class BackgroundAppState extends OverviewState {
		return super.isTaskbarAlignedWithHotseat(launcher);
		}

		@Override
		public boolean disallowTaskbarGlobalDrag() {
		// Enable global drag in overview
		return false;
		}

		@Override
		public boolean allowTaskbarInitialSplitSelection() {
		// Disallow split select from taskbar items in overview
		return false;
		}

		public static float[] getOverviewScaleAndOffsetForBackgroundState(
		BaseDraggingActivity activity) {
		return new float[] {

+12 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,18 @@ public class OverviewState extends LauncherState {
		return deviceProfile.isTablet;
		}

		@Override
		public boolean disallowTaskbarGlobalDrag() {
		// Disable global drag in overview
		return true;
		}

		@Override
		public boolean allowTaskbarInitialSplitSelection() {
		// Allow split select from taskbar items in overview
		return true;
		}

		@Override
		public String getDescription(Launcher launcher) {
		return launcher.getString(R.string.accessibility_recent_apps);

+14 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,20 @@ public abstract class LauncherState implements BaseState<LauncherState> {
		return true;
		}

		/**
		* Returns whether taskbar global drag is disallowed in this state.
		*/
		public boolean disallowTaskbarGlobalDrag() {
		return false;
		}

		/**
		* Returns whether the taskbar shortcut should trigger split selection mode.
		*/
		public boolean allowTaskbarInitialSplitSelection() {
		return false;
		}

		/**
		* Fraction shift in the vertical translation UI and related properties
		*