Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent quick scrub when dragging up"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-18 11:08:33 +00:00
committed by Android (Google) Code Review
parent c07dd18a3e e0903c9f05
commit db26bf12ac
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
View File

@@ -207,21 +207,31 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
int y = (int) event.getY();
int xDiff = Math.abs(x - mTouchDownX);
int yDiff = Math.abs(y - mTouchDownY);
boolean exceededTouchSlop;
boolean exceededTouchSlopX = xDiff > mScrollTouchSlop && xDiff > yDiff;
boolean exceededTouchSlopY = yDiff > mScrollTouchSlop && yDiff > xDiff;
boolean exceededTouchSlop, exceededPerpendicularTouchSlop;
int pos, touchDown, offset, trackSize;
if (mIsVertical) {
exceededTouchSlop = yDiff > mScrollTouchSlop && yDiff > xDiff;
exceededTouchSlop = exceededTouchSlopY;
exceededPerpendicularTouchSlop = exceededTouchSlopX;
pos = y;
touchDown = mTouchDownY;
offset = pos - mTrackRect.top;
trackSize = mTrackRect.height();
} else {
exceededTouchSlop = xDiff > mScrollTouchSlop && xDiff > yDiff;
exceededTouchSlop = exceededTouchSlopX;
exceededPerpendicularTouchSlop = exceededTouchSlopY;
pos = x;
touchDown = mTouchDownX;
offset = pos - mTrackRect.left;
trackSize = mTrackRect.width();
}
// Do not start scrubbing when dragging in the perpendicular direction
if (!mDraggingActive && exceededPerpendicularTouchSlop) {
mHandler.removeCallbacksAndMessages(null);
return false;
}
if (!mDragPositive) {
offset -= mIsVertical ? mTrackRect.height() : mTrackRect.width();
}