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

Commit 0feee23c authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Fix trackpad check" into udc-qpr-dev am: 3047f854 

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



Change-Id: I9aae2ccdb7ab2c37f8824657674a0e9ace4cb3bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e8f613b 3047f854

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

+2 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    private boolean isButtonPressFromTrackpad(MotionEvent ev) {

        // We don't allow back for button press from the trackpad, and yet we do with a mouse.

        int sources = InputManager.getInstance().getInputDevice(ev.getDeviceId()).getSources();

        return (sources & (SOURCE_MOUSE | SOURCE_TOUCHPAD)) == sources && ev.getButtonState() != 0;

        int sourceTrackpad = (SOURCE_MOUSE | SOURCE_TOUCHPAD);

        return (sources & sourceTrackpad) == sourceTrackpad && ev.getButtonState() != 0;

    }



    private void dispatchToBackAnimation(MotionEvent event) {