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

Commit 09b26ba6 authored by Matthew Ng's avatar Matthew Ng
Browse files

Do not show track when scrubing when notification shade is down 

Prevents drawing quick scrub track when notification shade is down. Also
allow the KeyButtonView touch events to be passed when notification
shade is down to show ripple.

Test: bring notifications down and swipe the home button to the right
Change-Id: I386e45f9f164e39bbba6baa86a881e1351940f7e
Fixes: 73667292
parent 341c2366

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

+7 −8
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 
    }



    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (ActivityManagerWrapper.getInstance().isScreenPinningActive()

                || mStatusBar.isKeyguardShowing()) {

        if (mNavigationBarView.inScreenPinning() || mStatusBar.isKeyguardShowing()

                || !mStatusBar.isPresenterFullyCollapsed()) {

            return false;

        }
@@ -170,7 +170,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 
            }

        }

        boolean handledByQuickscrub = mQuickScrubController.onInterceptTouchEvent(event);

        if (mStatusBar.isPresenterFullyCollapsed() && !handledByQuickscrub) {

        if (!handledByQuickscrub) {

            // Proxy motion events until we start intercepting for quickscrub

            proxyMotionEvents(event);

        }
@@ -184,18 +184,17 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture 
    }



    public boolean onTouchEvent(MotionEvent event) {

        if (ActivityManagerWrapper.getInstance().isScreenPinningActive()

                || mStatusBar.isKeyguardShowing()) {

        if (mNavigationBarView.inScreenPinning() || mStatusBar.isKeyguardShowing()

                || !mStatusBar.isPresenterFullyCollapsed()) {

            return false;

        }



        // The same down event was just sent on intercept and therefore can be ignored here

        boolean ignoreProxyDownEvent = event.getAction() == MotionEvent.ACTION_DOWN

                && mOverviewProxyService.getProxy() != null;

        boolean result = mStatusBar.isPresenterFullyCollapsed()

                && (mQuickScrubController.onTouchEvent(event)

        boolean result = mQuickScrubController.onTouchEvent(event)

                || ignoreProxyDownEvent

                || proxyMotionEvents(event));

                || proxyMotionEvents(event);

        result |= mRecentsAnimationStarted;

        if (mDockWindowEnabled) {

            result |= handleDockWindowEvent(event);