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

Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev

Browse Source
This commit is contained in:
Winson Chung
2015-10-14 20:42:21 +00:00
committed by Android (Google) Code Review
parent b7e722b88f c14a11e882
commit c7a873e356
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
View File

@@ -162,6 +162,14 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
mVelocityTracker.addMovement(createMotionEventForStackScroll(ev)); mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));
break; break;
} }
case MotionEvent.ACTION_POINTER_DOWN: {
final int index = ev.getActionIndex();
mActivePointerId = ev.getPointerId(index);
mLastMotionX = (int) ev.getX(index);
mLastMotionY = (int) ev.getY(index);
mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY);
break;
}
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
if (mActivePointerId == INACTIVE_POINTER_ID) break; if (mActivePointerId == INACTIVE_POINTER_ID) break;
@@ -187,6 +195,20 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY); mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY);
break; break;
} }
case MotionEvent.ACTION_POINTER_UP: {
int pointerIndex = ev.getActionIndex();
int pointerId = ev.getPointerId(pointerIndex);
if (pointerId == mActivePointerId) {
// Select a new active pointer id and reset the motion state
final int newPointerIndex = (pointerIndex == 0) ? 1 : 0;
mActivePointerId = ev.getPointerId(newPointerIndex);
mLastMotionX = (int) ev.getX(newPointerIndex);
mLastMotionY = (int) ev.getY(newPointerIndex);
mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY);
mVelocityTracker.clear();
}
break;
}
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP: { case MotionEvent.ACTION_UP: {
// Animate the scroll back if we've cancelled // Animate the scroll back if we've cancelled