Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Mylen
2023-05-15 17:57:57 +00:00
committed by Android (Google) Code Review
parent 0b922022eb 1495b90e6c
commit e64ac57d83
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -3498,7 +3498,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
* gesture), we always play haptic. * gesture), we always play haptic.
*/ */
private void maybeVibrateOnOpening(boolean openingWithTouch) { private void maybeVibrateOnOpening(boolean openingWithTouch) {
if (mVibrateOnOpening) { if (mVibrateOnOpening && mBarState != KEYGUARD && mBarState != SHADE_LOCKED) {
if (!openingWithTouch || !mHasVibratedOnOpen) { if (!openingWithTouch || !mHasVibratedOnOpen) {
mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK); mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);
mHasVibratedOnOpen = true; mHasVibratedOnOpen = true;
@@ -4939,7 +4939,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction); mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction);
} }
addMovement(event); addMovement(event);
if (!isFullyCollapsed() && !isOnKeyguard()) { if (!isFullyCollapsed()) {
maybeVibrateOnOpening(true /* openingWithTouch */); maybeVibrateOnOpening(true /* openingWithTouch */);
} }
float h = y - mInitialExpandY; float h = y - mInitialExpandY;