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

[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"

Browse Source 
This reverts commit 8229620ffb.

Will fix forward in u-qpr-dev

Reason for revert: Regression (b/282884621)

Change-Id: Iec04221e7d219028eceb8d5b5b005874f5310e74
Merged-In: Id988517e115611161e8eb25f695a37631112338c
This commit is contained in:
Tracy Zhou
2023-06-08 22:02:20 +00:00
parent 8229620ffb
commit 59d2868944
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,6 @@
*/ */
package com.android.systemui.navigationbar.gestural; package com.android.systemui.navigationbar.gestural;
import static android.view.InputDevice.SOURCE_MOUSE;
import static android.view.InputDevice.SOURCE_TOUCHPAD;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION; 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.classifier.Classifier.BACK_GESTURE;
@@ -939,12 +937,10 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
mMLResults = 0; mMLResults = 0;
mLogGesture = false; mLogGesture = false;
mInRejectedExclusion = false; mInRejectedExclusion = false;
// Trackpad back gestures don't have zones, so we don't need to check if the down event
// is within insets. Also we don't allow back for button press from the trackpad, and
// yet we do with a mouse.
boolean isWithinInsets = isWithinInsets((int) ev.getX(), (int) ev.getY()); boolean isWithinInsets = isWithinInsets((int) ev.getX(), (int) ev.getY());
// Trackpad back gestures don't have zones, so we don't need to check if the down event
// is within insets.
mAllowGesture = !mDisabledForQuickstep && mIsBackGestureAllowed mAllowGesture = !mDisabledForQuickstep && mIsBackGestureAllowed
&& !isButtonPressFromTrackpad(ev)
&& (isTrackpadMultiFingerSwipe || isWithinInsets) && (isTrackpadMultiFingerSwipe || isWithinInsets)
&& !mGestureBlockingActivityRunning && !mGestureBlockingActivityRunning
&& !QuickStepContract.isBackGestureDisabled(mSysUiFlags) && !QuickStepContract.isBackGestureDisabled(mSysUiFlags)
@@ -1051,11 +1047,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
mProtoTracer.scheduleFrameUpdate(); mProtoTracer.scheduleFrameUpdate();
} }
private boolean isButtonPressFromTrackpad(MotionEvent ev) {
int sources = InputManager.getInstance().getInputDevice(ev.getDeviceId()).getSources();
return (sources & (SOURCE_MOUSE | SOURCE_TOUCHPAD)) == sources && ev.getButtonState() != 0;
}
private void dispatchToBackAnimation(MotionEvent event) { private void dispatchToBackAnimation(MotionEvent event) {
if (mBackAnimation != null) { if (mBackAnimation != null) {
mVelocityTracker.addMovement(event); mVelocityTracker.addMovement(event);