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

Commit 4fdb1e29 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... 

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

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



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

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;

            }