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

Commit d63d2980 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix not being able to dismiss notifications with tap." into lmp-preview-dev

parents ab860fb4 787a0af8

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ public class ExpandHelper implements Gefingerpoken { 
                break;

        }

        mLastMotionY = ev.getRawY();

        return true;

        return mResizedView != null;

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+3 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public abstract class PanelView extends FrameLayout { 
                    if (mHeightAnimator != null) {

                        mHeightAnimator.cancel(); // end any outstanding animations

                    }

                    mTouchSlopExceeded = true;

                    mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning);

                    onTrackingStarted();

                }

                if (mExpandedHeight == 0) {
@@ -219,7 +219,8 @@ public abstract class PanelView extends FrameLayout { 
            case MotionEvent.ACTION_CANCEL:

                mTrackingPointer = -1;

                trackMovement(event);

                if (mTracking && mTouchSlopExceeded) {

                if ((mTracking && mTouchSlopExceeded)

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

                    float vel = getCurrentVelocity();

                    boolean expand = flingExpands(vel);

                    onTrackingStopped(expand);