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

Move check of bar state into maybeVibrateOnOpening.

Browse Source 
Change-Id: Ibc10a124aa59778c7d5acd885a076a492f5cfe36
Test: manual
Bug: 260676854
This commit is contained in:
Jason Mylen
2023-05-04 15:31:56 +00:00
parent b45aeda1d0
commit 1495b90e6c
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

@@ -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;