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

Commit 1495b90e authored by Jason Mylen's avatar Jason Mylen
Browse files

Move check of bar state into maybeVibrateOnOpening. 

Change-Id: Ibc10a124aa59778c7d5acd885a076a492f5cfe36
Test: manual
Bug: 260676854
parent b45aeda1

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

+2 −2
Original line number Diff line number Diff line
@@ -3492,7 +3492,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
     *                         gesture), we always play haptic.

     */

    private void maybeVibrateOnOpening(boolean openingWithTouch) {

        if (mVibrateOnOpening) {

        if (mVibrateOnOpening && mBarState != KEYGUARD && mBarState != SHADE_LOCKED) {

            if (!openingWithTouch || !mHasVibratedOnOpen) {

                mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);

                mHasVibratedOnOpen = true;
@@ -4932,7 +4932,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                        mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction);

                    }

                    addMovement(event);

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

                    if (!isFullyCollapsed()) {

                        maybeVibrateOnOpening(true /* openingWithTouch */);

                    }

                    float h = y - mInitialExpandY;