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

Commit 787a0af8 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix not being able to dismiss notifications with tap. 

Also fixes that the go-to-shade gesture sometimes triggers the unlock
hint animation.

Bug: 14487435
Bug: 15421928
Change-Id: Ie7e01c81a397b9b1a03baed82c1270ba4e7eb799
parent 6a247199

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);