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

Commit 4a9b5799 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix the flipping animation sometimes being played when pulling the... 

Merge "Fix the flipping animation sometimes being played when pulling the quick settings with two fingers." into cm-10.1
parents 1e803ed6 f6685c5c

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

+2 −7
Original line number Diff line number Diff line
@@ -178,16 +178,11 @@ public class NotificationPanelView extends PanelView { 
                    if (y > maxy) maxy = y;

                }

                if (maxy - miny < mHandleBarHeight) {

                    if (getMeasuredHeight() < mHandleBarHeight) {

                        mStatusBar.switchToSettings();

                    } else {

                        // Do not flip if the drag event started within the top bar

                        if (MotionEvent.ACTION_DOWN == event.getActionMasked() && event.getY(0) < mHandleBarHeight ) {

                    if (mJustPeeked || getMeasuredHeight() < mHandleBarHeight) {

                        mStatusBar.switchToSettings();

                    } else {

                        mStatusBar.flipToSettings();

                    }

                    }

                    mOkToFlip = false;

                }

            } else if (mSwipeTriggered) {

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class PanelView extends FrameLayout { 
    private float mTouchOffset;

    private float mExpandedFraction = 0;

    private float mExpandedHeight = 0;

    private boolean mJustPeeked;

    protected boolean mJustPeeked;

    private boolean mClosing;

    private boolean mRubberbanding;

    private boolean mTracking;