aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Disable quickswitch for desktop windowing" into tm-qpr-dev

Browse Source
This commit is contained in:
Ats Jenk
2023-02-15 17:48:12 +00:00
committed by Android (Google) Code Review
parent 9af03389d6 ce6cebd392
commit 5e74542570
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
View File

@@ -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
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
View File

@@ -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
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@@ -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;
}