Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check pointer count for trackpad gesture features" into udc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2023-03-22 05:52:58 +00:00
committed by Android (Google) Code Review
parent f03430058b 2daf6aaaf0
commit 0674cd7e10
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
View File

@@ -18,7 +18,7 @@ package com.android.systemui.navigationbar.gestural;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;
import static com.android.systemui.classifier.Classifier.BACK_GESTURE;
import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadMotionEvent;
import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe;
import android.annotation.NonNull;
import android.app.ActivityManager;
@@ -244,7 +244,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
private boolean mIsBackGestureAllowed;
private boolean mGestureBlockingActivityRunning;
private boolean mIsNewBackAffordanceEnabled;
private boolean mIsTrackpadGestureBackEnabled;
private boolean mIsTrackpadGestureFeaturesEnabled;
private boolean mIsButtonForceVisible;
private InputMonitor mInputMonitor;
@@ -590,7 +590,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
// Add a nav bar panel window
mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE);
mIsTrackpadGestureBackEnabled = mFeatureFlags.isEnabled(
mIsTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled(
Flags.TRACKPAD_GESTURE_FEATURES);
resetEdgeBackPlugin();
mPluginManager.addPluginListener(
@@ -883,7 +883,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
}
private void onMotionEvent(MotionEvent ev) {
boolean isTrackpadEvent = isTrackpadMotionEvent(mIsTrackpadGestureBackEnabled, ev);
boolean isTrackpadEvent = isTrackpadThreeFingerSwipe(mIsTrackpadGestureFeaturesEnabled, ev);
int action = ev.getActionMasked();
if (action == MotionEvent.ACTION_DOWN) {
if (DEBUG_MISSING_GESTURE) {

7
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java
View File

@@ -22,9 +22,10 @@ import android.view.MotionEvent;
public final class Utilities {
public static boolean isTrackpadMotionEvent(boolean isTrackpadGestureBackEnabled,
public static boolean isTrackpadThreeFingerSwipe(boolean isTrackpadGestureFeaturesEnabled,
MotionEvent event) {
return isTrackpadGestureBackEnabled
&& event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE;
return isTrackpadGestureFeaturesEnabled
&& event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE
&& event.getPointerCount() == 3;
}
}