diff options
| author | 2023-05-15 18:41:23 +0000 | |
|---|---|---|
| committer | 2023-05-15 18:41:23 +0000 | |
| commit | f092d7e6746f03b42bc4fa8484c5d07843a5f5ad (patch) | |
| tree | fb14259921a722838d18b576b15409a554b414c6 | |
| parent | a405d20f50e9ddb7f000f6c8c6d37abb71f3ab65 (diff) | |
| parent | 645f1544ad19e3c6d0fd94ede5a5ad30f63ad059 (diff) | |
Merge "Move check of bar state into maybeVibrateOnOpening." into udc-dev am: e64ac57d83 am: d9907580a8 am: 645f1544ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23029092
Change-Id: Iec2fffc2ad7a2d657e39c1ed145bd6ee1e54fc57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index e837786ccd89..2a4995eb93b7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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; |