Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c4e25e0 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Fixed swipe down while shade expanding not expanding QS" into... 

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

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



Change-Id: Id85469c66116bbdd26bb4769270bcc9e8b12f2af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5141a39f 210dd5c0

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    private boolean mInstantExpanding;

    private boolean mAnimateAfterExpanding;

    private boolean mIsFlinging;

    private boolean mLastFlingWasExpanding;

    private String mViewName;

    private float mInitialExpandY;

    private float mInitialExpandX;
@@ -2142,6 +2143,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    @VisibleForTesting

    void flingToHeight(float vel, boolean expand, float target,

            float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {

        mLastFlingWasExpanding = expand;

        mHeadsUpTouchHelper.notifyFling(!expand);

        mKeyguardStateController.notifyPanelFlingStart(!expand /* flingingToDismiss */);

        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

        // 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) {

            mShadeLog.logMotionEvent(event,

                    "handleQsTouch: shade touched while collapsing, QS tracking disabled");