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

Commit 20821579 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 1e139e86: Merge "Enforcing the touchslop now when flinging open before... 

am 1e139e86: Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev

* commit '1e139e86':
  Enforcing the touchslop now when flinging open before intercepting
parents ac0c1c6f 1e139e86

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

+8 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import java.io.PrintWriter; 
public abstract class PanelView extends FrameLayout {

    public static final boolean DEBUG = PanelBar.DEBUG;

    public static final String TAG = PanelView.class.getSimpleName();



    private final void logf(String fmt, Object... args) {

        Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args));

    }
@@ -77,6 +78,7 @@ public abstract class PanelView extends FrameLayout { 
    private boolean mTouchStartedInEmptyArea;

    private boolean mMotionAborted;

    private boolean mUpwardsWhenTresholdReached;

    private boolean mAnimatingOnDown;



    private ValueAnimator mHeightAnimator;

    private ObjectAnimator mPeekAnimator;
@@ -459,8 +461,8 @@ public abstract class PanelView extends FrameLayout { 
        switch (event.getActionMasked()) {

            case MotionEvent.ACTION_DOWN:

                mStatusBar.userActivity();

                if (mHeightAnimator != null && !mHintAnimationRunning ||

                        mPeekPending || mPeekAnimator != null) {

                mAnimatingOnDown = mHeightAnimator != null;

                if (mAnimatingOnDown && mClosing && !mHintAnimationRunning || mPeekPending || mPeekAnimator != null) {

                    cancelHeightAnimator();

                    cancelPeek();

                    mTouchSlopExceeded = true;
@@ -501,8 +503,10 @@ public abstract class PanelView extends FrameLayout { 
            case MotionEvent.ACTION_MOVE:

                final float h = y - mInitialTouchY;

                trackMovement(event);

                if (scrolledToBottom || mTouchStartedInEmptyArea) {

                    if (h < -mTouchSlop && h < -Math.abs(x - mInitialTouchX)) {

                if (scrolledToBottom || mTouchStartedInEmptyArea || mAnimatingOnDown) {

                    float hAbs = Math.abs(h);

                    if ((h < -mTouchSlop || (mAnimatingOnDown && hAbs > mTouchSlop))

                            && hAbs > Math.abs(x - mInitialTouchX)) {

                        cancelHeightAnimator();

                        startExpandMotion(x, y, true /* startTracking */, mExpandedHeight);

                        return true;