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

Merge "Handle edge cases for haptic feedback on shade opening." into tm-qpr-dev

Browse Source
This commit is contained in:
Jason Mylen
2023-01-25 15:58:45 +00:00
committed by Android (Google) Code Review
parent c7549f0052 a152ee8158
commit bfafedee12
1 changed files with 3 additions and 1 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

@@ -2157,6 +2157,7 @@ public final class NotificationPanelViewController implements Dumpable {
} }
ValueAnimator animator = createHeightAnimator(target, overshootAmount); ValueAnimator animator = createHeightAnimator(target, overshootAmount);
if (expand) { if (expand) {
maybeVibrateOnOpening(true /* openingWithTouch */);
if (expandBecauseOfFalsing && vel < 0) { if (expandBecauseOfFalsing && vel < 0) {
vel = 0; vel = 0;
} }
@@ -2167,6 +2168,7 @@ public final class NotificationPanelViewController implements Dumpable {
animator.setDuration(SHADE_OPEN_SPRING_OUT_DURATION); animator.setDuration(SHADE_OPEN_SPRING_OUT_DURATION);
} }
} else { } else {
mHasVibratedOnOpen = false;
if (shouldUseDismissingAnimation()) { if (shouldUseDismissingAnimation()) {
if (vel == 0) { if (vel == 0) {
animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
@@ -6375,7 +6377,7 @@ public final class NotificationPanelViewController implements Dumpable {
mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction); mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction);
} }
addMovement(event); addMovement(event);
if (!isFullyCollapsed()) { if (!isFullyCollapsed() && !isOnKeyguard()) {
maybeVibrateOnOpening(true /* openingWithTouch */); maybeVibrateOnOpening(true /* openingWithTouch */);
} }
float h = y - mInitialExpandY; float h = y - mInitialExpandY;