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

Merge "Move reset haptic effect into the move event handling." into tm-qpr-dev am: 84e751f92d

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

Change-Id: Ibbccf89f77b3c942830829846dd43d7c2089d7af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Mylen
2022-10-31 23:26:15 +00:00
committed by Automerger Merge Worker
parent a287ac13f5 84e751f92d
commit 5f1f019d0f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4729,8 +4729,6 @@ public final class NotificationPanelViewController {
private void startOpening(MotionEvent event) { private void startOpening(MotionEvent event) {
updatePanelExpansionAndVisibility(); updatePanelExpansionAndVisibility();
// Reset at start so haptic can be triggered as soon as panel starts to open.
mHasVibratedOnOpen = false;
//TODO: keyguard opens QS a different way; log that too? //TODO: keyguard opens QS a different way; log that too?
// Log the position of the swipe that opened the panel // Log the position of the swipe that opened the panel
@@ -6214,6 +6212,10 @@ public final class NotificationPanelViewController {
} }
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if (isFullyCollapsed()) {
// If panel is fully collapsed, reset haptic effect before adding movement.
mHasVibratedOnOpen = false;
}
addMovement(event); addMovement(event);
if (!isFullyCollapsed()) { if (!isFullyCollapsed()) {
maybeVibrateOnOpening(true /* openingWithTouch */); maybeVibrateOnOpening(true /* openingWithTouch */);