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

Commit 92b733da authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Ignore ACTION_DOWN events when mTracking is true" into tm-qpr-dev am:... 

Merge "Ignore ACTION_DOWN events when mTracking is true" into tm-qpr-dev am: 844bcac7 am: 7462bf2f

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



Change-Id: I6834a6870648d0f9c67dfab05d3608942c5ed86e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ceb79fe 7462bf2f

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

+10 −0
Original line number Diff line number Diff line
@@ -6135,6 +6135,11 @@ public final class NotificationPanelViewController implements Dumpable { 


            switch (event.getActionMasked()) {

                case MotionEvent.ACTION_DOWN:

                    if (mTracking) {

                        // TODO(b/247126247) fix underlying issue. Should be ACTION_POINTER_DOWN.

                        mShadeLog.d("Don't intercept down event while already tracking");

                        return false;

                    }

                    mCentralSurfaces.userActivity();

                    mAnimatingOnDown = mHeightAnimator != null && !mIsSpringBackAnimation;

                    mMinExpandHeight = 0.0f;
@@ -6222,6 +6227,11 @@ public final class NotificationPanelViewController implements Dumpable { 
                            "onTouch: duplicate down event detected... ignoring");

                    return true;

                }

                if (mTracking) {

                    // TODO(b/247126247) fix underlying issue. Should be ACTION_POINTER_DOWN.

                    mShadeLog.d("Don't handle down event while already tracking");

                    return true;

                }

                mLastTouchDownTime = event.getDownTime();

            }