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

Commit c868e22d authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fixed animation breakage when QS area tapped during... 

Merge "Revert "Fixed animation breakage when QS area tapped during expand/collapse"" into tm-qpr-dev am: 4f76d772 am: 8a0a7c7b

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



Change-Id: I01ae893b7b6f1ac07884678601cfdb29b61a1dee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e295314 8a0a7c7b

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

+1 −14
Original line number Diff line number Diff line
@@ -2072,13 +2072,6 @@ public final class NotificationPanelViewController implements Dumpable { 
                mInitialTouchX = x;

                initVelocityTracker();

                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

                        && shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, 0)) {

                    // Dragging down on the lockscreen statusbar should prohibit other interactions
@@ -2331,13 +2324,6 @@ public final class NotificationPanelViewController implements Dumpable { 
        if (!isFullyCollapsed()) {

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

            onQsTouch(event);

            if (!mConflictingQsExpansionGesture && !mSplitShadeEnabled) {
@@ -2578,6 +2564,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        // Reset scroll position and apply that position to the expanded height.

        float height = mQsExpansionHeight;

        setQsExpansionHeight(height);

        updateExpandedHeightToMaxHeight();

        mNotificationStackScrollLayoutController.checkSnoozeLeavebehind();



        // When expanding QS, let's authenticate the user if possible,