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

Revert "[Overview Actions] Disable swiping for TaskView if it's in select mode."

Browse Source 
This reverts commit 0499fb2060.

Reason for revert: This might break the post submit test. See b/150401176

Change-Id: Iafc420fff72de8e83ce5e325fc1e5b1a1efe7350
This commit is contained in:
Becky Qiu
2020-02-28 01:38:44 +00:00
parent 2fe6fb9671
commit 7ff297a81f
4 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
View File

@@ -105,10 +105,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
@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<T extends BaseDraggingActivity>
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

7
quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
View File

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

7
quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
View File

@@ -565,13 +565,6 @@ public abstract class RecentsView<T extends BaseActivity> 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;
}

4
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
View File

@@ -251,10 +251,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
}
}
public boolean isTaskOverlayModal() {
return mSnapshotView.getTaskOverlay().isOverlayModal();
}
public TaskMenuView getMenuView() {
return mMenuView;
}