diff options
| author | 2018-04-18 18:24:16 -0700 | |
|---|---|---|
| committer | 2018-04-18 18:24:16 -0700 | |
| commit | a262fed8e25dca7b54f9b3b8d5e74b5e7e37e8ab (patch) | |
| tree | d3b2f163134ed9ab3e0faa654d8d0378c460278d | |
| parent | 5b52eb937c2cd552d19757db17642c7d532b9bc6 (diff) | |
| parent | a596129a800dad980bde6afa0e3d9c2bef24d0aa (diff) | |
Merge "Reducing the touch slop for quickstep" into pi-dev am: 0a16178660
am: a596129a80
Change-Id: Ia5d566ad66e0b88b7144df1724624a3ed3b6842a
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java index bff0d9b84616..8d451c12410a 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java @@ -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) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java index d3790d440687..4cfbd8a3381f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java @@ -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; |