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

Commit e73f76e2 authored by Jason Mylen's avatar Jason Mylen Committed by Automerger Merge Worker
Browse files

Merge "Move reset haptic effect into the move event handling." into tm-qpr-dev... 

Merge "Move reset haptic effect into the move event handling." into tm-qpr-dev am: 84e751f9 am: 5f1f019d

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



Change-Id: Ic67f15ade07f8428bac1ad17b5e8219d80ad5990
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30777379 5f1f019d

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

+4 −2
Original line number Diff line number Diff line
@@ -4729,8 +4729,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
@@ -6214,6 +6212,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 */);