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

Commit 0a161786 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reducing the touch slop for quickstep" into pi-dev

parents b2097fca c5ac7113

packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class NavigationBarCompat { 
     */

    public static final int QUICK_STEP_DRAG_SLOP_PX = convertDpToPixel(10);

    public static final int QUICK_SCRUB_DRAG_SLOP_PX = convertDpToPixel(20);

    public static final int QUICK_STEP_TOUCH_SLOP_PX = convertDpToPixel(40);

    public static final int QUICK_STEP_TOUCH_SLOP_PX = convertDpToPixel(24);

    public static final int QUICK_SCRUB_TOUCH_SLOP_PX = convertDpToPixel(35);



    @Retention(RetentionPolicy.SOURCE)

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

+4 −4
Original line number Diff line number Diff line
@@ -215,16 +215,16 @@ public class QuickStepController implements GestureHelper { 
                int pos, touchDown, offset, trackSize;



                if (mIsVertical) {

                    exceededScrubTouchSlop = yDiff > QUICK_STEP_TOUCH_SLOP_PX && yDiff > xDiff;

                    exceededSwipeUpTouchSlop = xDiff > QUICK_STEP_DRAG_SLOP_PX && xDiff > yDiff;

                    exceededScrubTouchSlop = yDiff > QUICK_SCRUB_TOUCH_SLOP_PX && yDiff > xDiff;

                    exceededSwipeUpTouchSlop = xDiff > QUICK_STEP_TOUCH_SLOP_PX && xDiff > yDiff;

                    exceededScrubDragSlop = yDiff > QUICK_SCRUB_DRAG_SLOP_PX && yDiff > xDiff;

                    pos = y;

                    touchDown = mTouchDownY;

                    offset = pos - mTrackRect.top;

                    trackSize = mTrackRect.height();

                } else {

                    exceededScrubTouchSlop = xDiff > QUICK_STEP_TOUCH_SLOP_PX && xDiff > yDiff;

                    exceededSwipeUpTouchSlop = yDiff > QUICK_SCRUB_TOUCH_SLOP_PX && yDiff > xDiff;

                    exceededScrubTouchSlop = xDiff > QUICK_SCRUB_TOUCH_SLOP_PX && xDiff > yDiff;

                    exceededSwipeUpTouchSlop = yDiff > QUICK_STEP_TOUCH_SLOP_PX && yDiff > xDiff;

                    exceededScrubDragSlop = xDiff > QUICK_SCRUB_DRAG_SLOP_PX && xDiff > yDiff;

                    pos = x;

                    touchDown = mTouchDownX;