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 am: bfafedee12 am: 32507238ec

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

Change-Id: I8ef901eb4c84450d6533acebcc1a29d654f96ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Mylen
2023-01-25 17:15:19 +00:00
committed by Automerger Merge Worker
parent d1b629b27f 32507238ec
commit be48d37e75
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);
if (expand) {
maybeVibrateOnOpening(true /* openingWithTouch */);
if (expandBecauseOfFalsing && vel < 0) {
vel = 0;
}
@@ -2167,6 +2168,7 @@ public final class NotificationPanelViewController implements Dumpable {
animator.setDuration(SHADE_OPEN_SPRING_OUT_DURATION);
}
} else {
mHasVibratedOnOpen = false;
if (shouldUseDismissingAnimation()) {
if (vel == 0) {
animator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
@@ -6375,7 +6377,7 @@ public final class NotificationPanelViewController implements Dumpable {
mShadeLog.logHasVibrated(mHasVibratedOnOpen, mExpandedFraction);
}
addMovement(event);
if (!isFullyCollapsed()) {
if (!isFullyCollapsed() && !isOnKeyguard()) {
maybeVibrateOnOpening(true /* openingWithTouch */);
}
float h = y - mInitialExpandY;