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

Commit 8ab92876 authored by Matthew Ng's avatar Matthew Ng
Browse files

Resume swipe up when notification shade is opened 

Change-Id: Ia574565f0d44e3d0597b8b23b5eec66f1036e17b
Fixes: 79094268
Fixes: 79146824
Test: start swipe up and at same time swipe the notifications down
parent e09cde0c

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 
    private boolean mDownOnRecents;

    private VelocityTracker mVelocityTracker;

    private boolean mIsInScreenPinning;

    private boolean mNotificationsVisibleOnDown;



    private boolean mDockWindowEnabled;

    private boolean mDockWindowTouchSlopExceeded;
@@ -108,6 +109,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 
    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {

            mIsInScreenPinning = mNavigationBarView.inScreenPinning();

            mNotificationsVisibleOnDown = !mStatusBar.isPresenterFullyCollapsed();

        }

        if (!canHandleGestures()) {

            return false;
@@ -274,7 +276,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 


    private boolean canHandleGestures() {

        return !mIsInScreenPinning && !mStatusBar.isKeyguardShowing()

                && mStatusBar.isPresenterFullyCollapsed();

                && !mNotificationsVisibleOnDown;

    }



    private int calculateDragMode() {