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

Merge "Revert "Fixed animation breakage when QS area tapped during expand/collapse"" into tm-qpr-dev

Browse Source
This commit is contained in:
Sam Dubey
2022-11-29 09:14:57 +00:00
committed by Android (Google) Code Review
parent b5130278f6 b590a6fa4e
commit 4f76d7728b
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2072,13 +2072,6 @@ public final class NotificationPanelViewController implements Dumpable {
mInitialTouchX = x; mInitialTouchX = x;
initVelocityTracker(); initVelocityTracker();
trackMovement(event); trackMovement(event);
float qsExpansionFraction = computeQsExpansionFraction();
// Intercept the touch if QS is between fully collapsed and fully expanded state
if (qsExpansionFraction > 0.0 && qsExpansionFraction < 1.0) {
mShadeLog.logMotionEvent(event,
"onQsIntercept: down action, QS partially expanded/collapsed");
return true;
}
if (mKeyguardShowing if (mKeyguardShowing
&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, 0)) { && shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, 0)) {
// Dragging down on the lockscreen statusbar should prohibit other interactions // Dragging down on the lockscreen statusbar should prohibit other interactions
@@ -2331,13 +2324,6 @@ public final class NotificationPanelViewController implements Dumpable {
if (!isFullyCollapsed()) { if (!isFullyCollapsed()) {
handleQsDown(event); handleQsDown(event);
} }
// defer touches on QQS to shade while shade is collapsing. Added margin for error
// as sometimes the qsExpansionFraction can be a tiny value instead of 0 when in QQS.
if (computeQsExpansionFraction() <= 0.01 && getExpandedFraction() < 1.0) {
mShadeLog.logMotionEvent(event,
"handleQsTouch: QQS touched while shade collapsing");
mQsTracking = false;
}
if (!mQsExpandImmediate && mQsTracking) { if (!mQsExpandImmediate && mQsTracking) {
onQsTouch(event); onQsTouch(event);
if (!mConflictingQsExpansionGesture && !mSplitShadeEnabled) { if (!mConflictingQsExpansionGesture && !mSplitShadeEnabled) {
@@ -2578,6 +2564,7 @@ public final class NotificationPanelViewController implements Dumpable {
// Reset scroll position and apply that position to the expanded height. // Reset scroll position and apply that position to the expanded height.
float height = mQsExpansionHeight; float height = mQsExpansionHeight;
setQsExpansionHeight(height); setQsExpansionHeight(height);
updateExpandedHeightToMaxHeight();
mNotificationStackScrollLayoutController.checkSnoozeLeavebehind(); mNotificationStackScrollLayoutController.checkSnoozeLeavebehind();
// When expanding QS, let's authenticate the user if possible, // When expanding QS, let's authenticate the user if possible,