diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java index f79ad25571..947a8614d2 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java @@ -105,10 +105,6 @@ public abstract class TaskViewTouchController @Override public boolean onControllerInterceptTouchEvent(MotionEvent ev) { - if ((ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_CANCEL) - && mCurrentAnimation == null) { - clearState(); - } if (ev.getAction() == MotionEvent.ACTION_DOWN) { mNoIntercept = !canInterceptTouch(); if (mNoIntercept) { @@ -129,11 +125,6 @@ public abstract class TaskViewTouchController TaskView view = mRecentsView.getTaskViewAt(i); if (mRecentsView.isTaskViewVisible(view) && mActivity.getDragLayer() .isEventOverView(view, ev)) { - // Disable swiping up and down if the task overlay is modal. - if (view.isTaskOverlayModal()) { - mTaskBeingDragged = null; - break; - } mTaskBeingDragged = view; if (!SysUINavigationMode.getMode(mActivity).hasGestures) { // Don't allow swipe down to open if we don't support swipe up diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java index eb3b190110..ec7cddfe07 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java @@ -87,12 +87,5 @@ public class TaskOverlayFactory implements ResourceBasedOverride { * Called when the overlay is no longer used. */ public void reset() { } - - /** - * Whether the overlay is modal, which means only tapping is enabled, but no swiping. - */ - public boolean isOverlayModal() { - return false; - } } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index 007493d0de..e34e74c7d7 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -565,13 +565,6 @@ public abstract class RecentsView extends PagedView impl return isHandlingTouch() || shouldStealTouchFromSiblingsBelow(ev); } - @Override - protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) { - // If the task overlay is modal, should disable left and right swiping. - if (getCurrentPageTaskView() != null && !getCurrentPageTaskView().isTaskOverlayModal()) { - super.determineScrollingStart(ev, touchSlopScale); - } - } protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) { return true; } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 79b9a9d833..dce92ff390 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -251,10 +251,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } } - public boolean isTaskOverlayModal() { - return mSnapshotView.getTaskOverlay().isOverlayModal(); - } - public TaskMenuView getMenuView() { return mMenuView; }