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

Merge "Fixed swipe down while shade expanding not expanding QS" into tm-qpr-dev am: 56833a3d69

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

Change-Id: Id7f7400f8517c846d2ac6d85b01bc5ce23dc3368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lee
2023-02-03 23:34:47 +00:00
committed by Automerger Merge Worker
parent f9335bf867 56833a3d69
commit 210dd5c0ec
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

@@ -685,6 +685,7 @@ public final class NotificationPanelViewController implements Dumpable {
private boolean mInstantExpanding; private boolean mInstantExpanding;
private boolean mAnimateAfterExpanding; private boolean mAnimateAfterExpanding;
private boolean mIsFlinging; private boolean mIsFlinging;
private boolean mLastFlingWasExpanding;
private String mViewName; private String mViewName;
private float mInitialExpandY; private float mInitialExpandY;
private float mInitialExpandX; private float mInitialExpandX;
@@ -2142,6 +2143,7 @@ public final class NotificationPanelViewController implements Dumpable {
@VisibleForTesting @VisibleForTesting
void flingToHeight(float vel, boolean expand, float target, void flingToHeight(float vel, boolean expand, float target,
float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) { float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {
mLastFlingWasExpanding = expand;
mHeadsUpTouchHelper.notifyFling(!expand); mHeadsUpTouchHelper.notifyFling(!expand);
mKeyguardStateController.notifyPanelFlingStart(!expand /* flingingToDismiss */); mKeyguardStateController.notifyPanelFlingStart(!expand /* flingingToDismiss */);
setClosingWithAlphaFadeout(!expand && !isOnKeyguard() && getFadeoutAlpha() == 1.0f); setClosingWithAlphaFadeout(!expand && !isOnKeyguard() && getFadeoutAlpha() == 1.0f);
@@ -2531,7 +2533,7 @@ public final class NotificationPanelViewController implements Dumpable {
} }
// defer touches on QQS to shade while shade is collapsing. Added margin for error // 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. // as sometimes the qsExpansionFraction can be a tiny value instead of 0 when in QQS.
if (!mSplitShadeEnabled if (!mSplitShadeEnabled && !mLastFlingWasExpanding
&& computeQsExpansionFraction() <= 0.01 && getExpandedFraction() < 1.0) { && computeQsExpansionFraction() <= 0.01 && getExpandedFraction() < 1.0) {
mShadeLog.logMotionEvent(event, mShadeLog.logMotionEvent(event,
"handleQsTouch: shade touched while collapsing, QS tracking disabled"); "handleQsTouch: shade touched while collapsing, QS tracking disabled");