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

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

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

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



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

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;