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

Commit e64ac57d authored by Jason Mylen's avatar Jason Mylen Committed by Android (Google) Code Review
Browse files

Merge "Move check of bar state into maybeVibrateOnOpening." into udc-dev

parents 0b922022 1495b90e

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

+2 −2
Original line number Diff line number Diff line
@@ -3498,7 +3498,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;
@@ -4939,7 +4939,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;