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

Commit 10fa9f44 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Revert "Fixed animation breakage when QS area tapped during expand/collapse""" into tm-qpr-dev am: a4737f02 am: 94f1d9bf

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



Change-Id: Ia6fb273ad24c04a8d4c03bac0268b884deab2684
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b1d7b98 94f1d9bf

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

+16 −1
Original line number Original line Diff line number Diff line
@@ -2072,6 +2072,14 @@ 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 (!mSplitShadeEnabled

                        && 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
@@ -2324,6 +2332,14 @@ 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 (!mSplitShadeEnabled

                && 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) {
@@ -2564,7 +2580,6 @@ 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,