Merge "Disable quickswitch for desktop windowing" into tm-qpr-dev (5e745425) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.util.MotionPauseDetector;
		import com.android.quickstep.util.WorkspaceRevealAnim;
		import com.android.quickstep.views.DesktopTaskView;
		import com.android.quickstep.views.LauncherRecentsView;
		import com.android.quickstep.views.RecentsView;

		@@ -164,6 +165,10 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		if ((stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0) {
		return false;
		}
		if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {
		// TODO(b/268075592): add support for quickswitch to/from desktop
		return false;
		}
		return true;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.launcher3.util.DisplayController;
		import com.android.launcher3.util.NavigationMode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.views.DesktopTaskView;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;

		@@ -78,6 +79,10 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
		if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) == 0) {
		return false;
		}
		if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {
		// TODO(b/268075592): add support for quickswitch to/from desktop
		return false;
		}
		return true;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -1167,6 +1167,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		return LAST_TASK;
		}

		if (DesktopTaskView.DESKTOP_MODE_SUPPORTED && endTarget == NEW_TASK) {
		// TODO(b/268075592): add support for quickswitch to/from desktop
		return LAST_TASK;
		}

		return endTarget;
		}