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

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

Merge "Fixed consistent flicker on shade open after multitouch" into tm-qpr-dev am: accfd441 

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



Change-Id: I569fd26a136b25119d3182d9b70f3c6f04e63167
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a32ccb00 accfd441

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

+14 −5
Original line number Diff line number Diff line
@@ -4958,8 +4958,12 @@ public final class NotificationPanelViewController implements Dumpable { 
            beginJankMonitoring();

        }

        mInitialOffsetOnTouch = expandedHeight;

        if (!mTracking || isFullyCollapsed()) {

            mInitialExpandY = newY;

            mInitialExpandX = newX;

        } else {

            mShadeLog.d("not setting mInitialExpandY in startExpandMotion");

        }

        mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();

        if (startTracking) {

            mTouchSlopExceeded = true;
@@ -6143,8 +6147,12 @@ public final class NotificationPanelViewController implements Dumpable { 
                                + " false");

                        return true;

                    }

                    if (!mTracking || isFullyCollapsed()) {

                        mInitialExpandY = y;

                        mInitialExpandX = x;

                    } else {

                        mShadeLog.d("not setting mInitialExpandY in onInterceptTouch");

                    }

                    mTouchStartedInEmptyArea = !isInContentBounds(x, y);

                    mTouchSlopExceeded = mTouchSlopExceededBeforeDown;

                    mMotionAborted = false;
@@ -6333,7 +6341,8 @@ public final class NotificationPanelViewController implements Dumpable { 
            final float x = event.getX(pointerIndex);

            final float y = event.getY(pointerIndex);



            if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {

            if (event.getActionMasked() == MotionEvent.ACTION_DOWN

                    || event.getActionMasked() == MotionEvent.ACTION_MOVE) {

                mGestureWaitForTouchSlop = shouldGestureWaitForTouchSlop();

                mIgnoreXTouchSlop = true;

            }