Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2871844 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Disable 3-finger workspace scroll" into udc-dev

parents 7953f25c a33fb696

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static android.view.MotionEvent.ACTION_MOVE; 
import static android.view.MotionEvent.ACTION_UP;

import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY;



import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN;

import static com.android.quickstep.MotionEventsUtils.isTrackpadMotionEvent;



import android.graphics.PointF;

import android.util.SparseArray;

quickstep/src/com/android/quickstep/RotationTouchHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.quickstep; 
import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Surface.ROTATION_0;



import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;

import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;

import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;

import static com.android.launcher3.util.DisplayController.CHANGE_ALL;

import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;
@@ -25,8 +27,6 @@ import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; 
import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS;

import static com.android.quickstep.MotionEventsUtils.isTrackpadMotionEvent;

import static com.android.quickstep.MotionEventsUtils.isTrackpadMultiFingerSwipe;



import android.content.Context;

import android.content.res.Resources;

quickstep/src/com/android/quickstep/TouchInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import static android.view.MotionEvent.ACTION_POINTER_DOWN; 
import static android.view.MotionEvent.ACTION_POINTER_UP;

import static android.view.MotionEvent.ACTION_UP;



import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;

import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.GestureState.DEFAULT_STATE;

import static com.android.quickstep.MotionEventsUtils.isTrackpadMultiFingerSwipe;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP;

quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ package com.android.quickstep.inputconsumers; 


import static android.view.MotionEvent.INVALID_POINTER_ID;



import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;

import static com.android.launcher3.Utilities.squaredHypot;

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING;

import static com.android.quickstep.MotionEventsUtils.isTrackpadMotionEvent;



import android.content.Context;

import android.content.res.Resources;

quickstep/src/com/android/quickstep/MotionEventsUtils.java→src/com/android/launcher3/MotionEventsUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.quickstep;

package com.android.launcher3;



import static android.view.MotionEvent.CLASSIFICATION_TWO_FINGER_SWIPE;