Snap window in Y direction when using quickswitch
if the y threshold is not crossed
Also updating various touch thresholds to properly respect density
changes
Bug: 135214165
Bug: 132915522
Change-Id: Ifba371afd0c20790390a3bd37065cd7162d128df
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 69b25db..6bc543f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -22,10 +22,9 @@
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;
import static android.view.MotionEvent.INVALID_POINTER_ID;
+
import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.uioverrides.RecentsUiFactory.ROTATION_LANDSCAPE;
-import static com.android.launcher3.uioverrides.RecentsUiFactory.ROTATION_SEASCAPE;
import static com.android.launcher3.util.RaceConditionTracker.ENTER;
import static com.android.launcher3.util.RaceConditionTracker.EXIT;
import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
@@ -45,10 +44,7 @@
import android.view.VelocityTracker;
import android.view.ViewConfiguration;
-import androidx.annotation.UiThread;
-
import com.android.launcher3.R;
-import com.android.launcher3.graphics.RotationMode;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.RaceConditionTracker;
import com.android.launcher3.util.TraceHelper;
@@ -68,10 +64,11 @@
import com.android.systemui.shared.system.BackgroundExecutor;
import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.InputMonitorCompat;
-import com.android.systemui.shared.system.QuickStepContract;
import java.util.function.Consumer;
+import androidx.annotation.UiThread;
+
/**
* Input consumer for handling events originating from an activity other than Launcher
*/
@@ -81,6 +78,9 @@
public static final String DOWN_EVT = "OtherActivityInputConsumer.DOWN";
private static final String UP_EVT = "OtherActivityInputConsumer.UP";
+ // TODO: Move to quickstep contract
+ private static final float QUICKSTEP_TOUCH_SLOP_RATIO = 3;
+
private final CachedEventDispatcher mRecentsViewDispatcher = new CachedEventDispatcher();
private final RunningTaskInfo mRunningTask;
private final RecentsModel mRecentsModel;
@@ -107,14 +107,16 @@
private final PointF mLastPos = new PointF();
private int mActivePointerId = INVALID_POINTER_ID;
- private final float mDragSlop;
+ // Distance after which we start dragging the window.
+ private final float mTouchSlop;
+
private final float mSquaredTouchSlop;
private final boolean mDisableHorizontalSwipe;
// Slop used to check when we start moving window.
- private boolean mPassedDragSlop;
+ private boolean mPaddedWindowMoveSlop;
// Slop used to determine when we say that the gesture has started.
- private boolean mPassedTouchSlop;
+ private boolean mPassedPilferInputSlop;
// Might be displacement in X or Y, depending on the direction we are swiping from the nav bar.
private float mStartDisplacement;
@@ -156,12 +158,13 @@
mSwipeSharedState = swipeSharedState;
mNavBarPosition = new NavBarPosition(base);
- mDragSlop = QuickStepContract.getQuickStepDragSlopPx();
- float slop = QuickStepContract.getQuickStepTouchSlopPx();
+ mTouchSlop = ViewConfiguration.get(this).getScaledTouchSlop();
+
+ float slop = QUICKSTEP_TOUCH_SLOP_RATIO * mTouchSlop;
mSquaredTouchSlop = slop * slop;
- mPassedTouchSlop = mPassedDragSlop = continuingPreviousGesture;
- mDisableHorizontalSwipe = !mPassedTouchSlop && disableHorizontalSwipe;
+ mPassedPilferInputSlop = mPaddedWindowMoveSlop = continuingPreviousGesture;
+ mDisableHorizontalSwipe = !mPassedPilferInputSlop && disableHorizontalSwipe;
}
@Override
@@ -183,7 +186,7 @@
}
// Proxy events to recents view
- if (mPassedDragSlop && mInteractionHandler != null
+ if (mPaddedWindowMoveSlop && mInteractionHandler != null
&& !mRecentsViewDispatcher.hasConsumer()) {
mRecentsViewDispatcher.setConsumer(mInteractionHandler.getRecentsViewDispatcher(
mNavBarPosition.getRotationMode()));
@@ -217,7 +220,7 @@
break;
}
case ACTION_POINTER_DOWN: {
- if (!mPassedTouchSlop) {
+ if (!mPassedPilferInputSlop) {
// Cancel interaction in case of multi-touch interaction
int ptrIdx = ev.getActionIndex();
if (!mSwipeTouchRegion.contains(ev.getX(ptrIdx), ev.getY(ptrIdx))) {
@@ -248,18 +251,18 @@
float displacement = getDisplacement(ev);
float displacementX = mLastPos.x - mDownPos.x;
- if (!mPassedDragSlop) {
+ if (!mPaddedWindowMoveSlop) {
if (!mIsDeferredDownTarget) {
// Normal gesture, ensure we pass the drag slop before we start tracking
// the gesture
- if (Math.abs(displacement) > mDragSlop) {
- mPassedDragSlop = true;
- mStartDisplacement = displacement;
+ if (Math.abs(displacement) > mTouchSlop) {
+ mPaddedWindowMoveSlop = true;
+ mStartDisplacement = Math.min(displacement, -mTouchSlop);
}
}
}
- if (!mPassedTouchSlop) {
+ if (!mPassedPilferInputSlop) {
float displacementY = mLastPos.y - mDownPos.y;
if (squaredHypot(displacementX, displacementY) >= mSquaredTouchSlop) {
if (mDisableHorizontalSwipe
@@ -269,23 +272,24 @@
break;
}
- mPassedTouchSlop = true;
+ mPassedPilferInputSlop = true;
if (mIsDeferredDownTarget) {
// Deferred gesture, start the animation and gesture tracking once
// we pass the actual touch slop
startTouchTrackingForWindowAnimation(ev.getEventTime());
}
- if (!mPassedDragSlop) {
- mPassedDragSlop = true;
- mStartDisplacement = displacement;
+ if (!mPaddedWindowMoveSlop) {
+ mPaddedWindowMoveSlop = true;
+ mStartDisplacement = Math.min(displacement, -mTouchSlop);
+
}
notifyGestureStarted();
}
}
if (mInteractionHandler != null) {
- if (mPassedDragSlop) {
+ if (mPaddedWindowMoveSlop) {
// Move
mInteractionHandler.updateDisplacement(displacement - mStartDisplacement);
}
@@ -362,7 +366,7 @@
RaceConditionTracker.onEvent(UP_EVT, ENTER);
TraceHelper.endSection("TouchInt");
- if (mPassedDragSlop && mInteractionHandler != null) {
+ if (mPaddedWindowMoveSlop && mInteractionHandler != null) {
if (ev.getActionMasked() == ACTION_CANCEL) {
mInteractionHandler.onGestureCancelled();
} else {
@@ -448,6 +452,6 @@
@Override
public boolean allowInterceptByParent() {
- return !mPassedTouchSlop;
+ return !mPassedPilferInputSlop;
}
}