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

Commit 5265ba94 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757



Change-Id: Id2c78364c7bc3b2c6b04ef09bdd6ac03093ba366
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 891ac372 59d28689

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

+2 −11
Original line number Original line Diff line number Diff line
@@ -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;
@@ -951,12 +949,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)
@@ -1069,11 +1065,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);