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

Commit ecfcdcb6 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Revert "Ignore ACTION_DOWN events when mTracking is true"" into tm-qpr-dev

parents ce066a86 2970e982

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

+0 −10
Original line number Diff line number Diff line
@@ -4636,11 +4636,6 @@ 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;
@@ -4728,11 +4723,6 @@ 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();

            }