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

Commit c8f0ac0c authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Commit to OtherActivityInputConsumer when swiping up in app" into udc-dev

parents 216ae0f7 33bcdbbb
Loading
Loading
Loading
Loading
+15 −6
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ public class StatusBarInputConsumer extends DelegateInputConsumer {
    private final SystemUiProxy mSystemUiProxy;
    private final float mTouchSlop;
    private final PointF mDown = new PointF();
    private boolean mHasPassedTouchSlop;

    public StatusBarInputConsumer(Context context, InputConsumer delegate,
            InputMonitorCompat inputMonitor) {
@@ -53,16 +54,24 @@ public class StatusBarInputConsumer extends DelegateInputConsumer {
            mDelegate.onMotionEvent(ev);

            switch (ev.getActionMasked()) {
                case ACTION_DOWN -> mDown.set(ev.getX(), ev.getY());
                case ACTION_DOWN -> {
                    mDown.set(ev.getX(), ev.getY());
                    mHasPassedTouchSlop = false;
                }
                case ACTION_MOVE -> {
                    if (!mHasPassedTouchSlop) {
                        float displacementY = ev.getY() - mDown.y;
                    if (displacementY > mTouchSlop) {
                        if (Math.abs(displacementY) > mTouchSlop) {
                            mHasPassedTouchSlop = true;
                            if (displacementY > 0) {
                                setActive(ev);
                                ev.setAction(ACTION_DOWN);
                                dispatchTouchEvent(ev);
                            }
                        }
                    }
                }
            }
        } else {
            dispatchTouchEvent(ev);
        }