Merge "Stop mouse click+drag from opening all apps" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
6c19792dcd
@@ -16,6 +16,7 @@
|
||||
package com.android.launcher3.touch;
|
||||
|
||||
import static com.android.app.animation.Interpolators.scrollInterpolatorForVelocity;
|
||||
import static com.android.launcher3.Flags.enableMouseInteractionChanges;
|
||||
import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
|
||||
import static com.android.launcher3.LauncherAnimUtils.TABLET_BOTTOM_SHEET_SUCCESS_TRANSITION_PROGRESS;
|
||||
import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
|
||||
@@ -33,6 +34,7 @@ import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFram
|
||||
|
||||
import android.animation.Animator.AnimatorListener;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.view.InputDevice;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
import com.android.launcher3.Launcher;
|
||||
@@ -107,7 +109,9 @@ public abstract class AbstractStateChangeTouchController
|
||||
ignoreSlopWhenSettling = true;
|
||||
} else {
|
||||
directionsToDetectScroll = getSwipeDirection();
|
||||
if (directionsToDetectScroll == 0) {
|
||||
boolean ignoreMouseScroll = ev.getSource() == InputDevice.SOURCE_MOUSE
|
||||
&& enableMouseInteractionChanges();
|
||||
if (directionsToDetectScroll == 0 || ignoreMouseScroll) {
|
||||
mNoIntercept = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user