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

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

Merge "Handle edge cases for haptic feedback on shade opening." into tm-qpr-dev am: bfafedee 

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



Change-Id: I9a1d71ecc656edde4151d107497366753baa679f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffabe54b bfafedee

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

+3 −1
Original line number Diff line number Diff line
@@ -2157,6 +2157,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        }

        ValueAnimator animator = createHeightAnimator(target, overshootAmount);

        if (expand) {

            maybeVibrateOnOpening(true /* openingWithTouch */);

            if (expandBecauseOfFalsing && vel < 0) {

                vel = 0;

            }
@@ -2167,6 +2168,7 @@ public final class NotificationPanelViewController implements Dumpable { 
                animator.setDuration(SHADE_OPEN_SPRING_OUT_DURATION);

            }

        } else {

            mHasVibratedOnOpen = false;

            if (shouldUseDismissingAnimation()) {

                if (vel == 0) {

                    animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
@@ -6375,7 +6377,7 @@ public final class NotificationPanelViewController implements Dumpable { 
                        mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction);

                    }

                    addMovement(event);

                    if (!isFullyCollapsed()) {

                    if (!isFullyCollapsed() && !isOnKeyguard()) {

                        maybeVibrateOnOpening(true /* openingWithTouch */);

                    }

                    float h = y - mInitialExpandY;