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

Commit 08c9c63c authored by Jason Mylen's avatar Jason Mylen
Browse files

Move reset haptic effect into the move event handling. 

This is a low risk fix for the regression of the haptic effect not being played by not changing any of the event handling, even though that is
likely worth further investigation. See ag/16624524 for and b/197602842 for more context.

Fix: 197602842
Test: manual
Change-Id: Iacdcb4e9cd3541d6d1ec4f0b1b406ff3f74f46bb
parent e6fed446

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+4 −2
Original line number Diff line number Diff line
@@ -4663,8 +4663,6 @@ public final class NotificationPanelViewController { 


    private void startOpening(MotionEvent event) {

        updatePanelExpansionAndVisibility();

        // Reset at start so haptic can be triggered as soon as panel starts to open.

        mHasVibratedOnOpen = false;

        //TODO: keyguard opens QS a different way; log that too?



        // Log the position of the swipe that opened the panel
@@ -6180,6 +6178,10 @@ public final class NotificationPanelViewController { 
                    }

                    break;

                case MotionEvent.ACTION_MOVE:

                    if (isFullyCollapsed()) {

                        // If panel is fully collapsed, reset haptic effect before adding movement.

                        mHasVibratedOnOpen = false;

                    }

                    addMovement(event);

                    if (!isFullyCollapsed()) {

                        maybeVibrateOnOpening(true /* openingWithTouch */);