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

Merge "Ignore down touches in QS while animating" into tm-qpr-dev

Browse Source
This commit is contained in:
Justin Weir
2023-01-12 12:29:11 +00:00
committed by Android (Google) Code Review
parent 54383d1495 ea18d20913
commit 73d4bdaf36
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2473,7 +2473,7 @@ public final class NotificationPanelViewController implements Dumpable {
mInitialTouchY = event.getY();
mInitialTouchX = event.getX();
}
if (!isFullyCollapsed()) {
if (!isFullyCollapsed() && !isShadeOrQsHeightAnimationRunning()) {
handleQsDown(event);
}
// defer touches on QQS to shade while shade is collapsing. Added margin for error
@@ -5263,6 +5263,11 @@ public final class NotificationPanelViewController implements Dumpable {
}
}
/** Returns whether a shade or QS expansion animation is running */
private boolean isShadeOrQsHeightAnimationRunning() {
return mHeightAnimator != null && !mHintAnimationRunning && !mIsSpringBackAnimation;
}
/**
* Phase 2: Bounce down.
*/
@@ -6280,8 +6285,7 @@ public final class NotificationPanelViewController implements Dumpable {
mCollapsedAndHeadsUpOnDown =
isFullyCollapsed() && mHeadsUpManager.hasPinnedHeadsUp();
addMovement(event);
boolean regularHeightAnimationRunning = mHeightAnimator != null
&& !mHintAnimationRunning && !mIsSpringBackAnimation;
boolean regularHeightAnimationRunning = isShadeOrQsHeightAnimationRunning();
if (!mGestureWaitForTouchSlop || regularHeightAnimationRunning) {
mTouchSlopExceeded = regularHeightAnimationRunning
|| mTouchSlopExceededBeforeDown;