Disable 3-finger workspace scroll
Fixes: 274474023
Test: 3-finger horizontal scroll on the workspace doesn't do anything
Change-Id: I32ade8a5c26eae43f5ce9c8c71d47ed0d1abd5a2
diff --git a/src/com/android/launcher3/MotionEventsUtils.java b/src/com/android/launcher3/MotionEventsUtils.java
new file mode 100644
index 0000000..7f8794d
--- /dev/null
+++ b/src/com/android/launcher3/MotionEventsUtils.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import static android.view.MotionEvent.CLASSIFICATION_TWO_FINGER_SWIPE;
+
+import static com.android.launcher3.config.FeatureFlags.ENABLE_TRACKPAD_GESTURE;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.view.MotionEvent;
+
+/** Handles motion events from trackpad. */
+public class MotionEventsUtils {
+
+ /** {@link MotionEvent#CLASSIFICATION_MULTI_FINGER_SWIPE} is hidden. */
+ public static final int CLASSIFICATION_MULTI_FINGER_SWIPE = 4;
+
+ @TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+ public static boolean isTrackpadScroll(MotionEvent event) {
+ return ENABLE_TRACKPAD_GESTURE.get()
+ && event.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE;
+ }
+
+ @TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+ public static boolean isTrackpadMultiFingerSwipe(MotionEvent event) {
+ return ENABLE_TRACKPAD_GESTURE.get()
+ && event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE;
+ }
+
+ public static boolean isTrackpadMotionEvent(MotionEvent event) {
+ return isTrackpadScroll(event) || isTrackpadMultiFingerSwipe(event);
+ }
+}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ba492d5..fd78739 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -25,6 +25,7 @@
import static com.android.launcher3.LauncherState.HINT_STATE;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.SPRING_LOADED;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -1065,6 +1066,29 @@
}
/**
+ * Needed here because launcher has a fullscreen exclusion rect and doesn't pilfer the pointers.
+ */
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ if (isTrackpadMultiFingerSwipe(ev)) {
+ return false;
+ }
+ return super.onInterceptTouchEvent(ev);
+ }
+
+ /**
+ * Needed here because launcher has a fullscreen exclusion rect and doesn't pilfer the pointers.
+ */
+ @SuppressLint("ClickableViewAccessibility")
+ @Override
+ public boolean onTouchEvent(MotionEvent ev) {
+ if (isTrackpadMultiFingerSwipe(ev)) {
+ return false;
+ }
+ return super.onTouchEvent(ev);
+ }
+
+ /**
* Called directly from a CellLayout (not by the framework), after we've been added as a
* listener via setOnInterceptTouchEventListener(). This allows us to tell the CellLayout
* that it should intercept touch events, which is not something that is normally supported.