Fix not releasing touching state of the handle on divider bar

After ag/14340443, the touching state of divider handle won't be reset
after tapping on divider bar. This makes sure to reset touching state
whenever received cancel/up touch event.

Bug: 186626153
Test: atest WMShellUnitTests
Test: check the touching of the handle on divider bar will be reset
after single tapping on divider bar.

Change-Id: I8645d17cda8833aa75b108f863e48655a7c87feb
This commit is contained in:
Jerry Chang
2021-05-14 15:43:19 +08:00
parent 68667bdd3a
commit 49b3cc5bd4
2 changed files with 6 additions and 5 deletions

View File

@@ -139,11 +139,10 @@ public class DividerView extends FrameLayout implements View.OnTouchListener,
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
mVelocityTracker.addMovement(event);
releaseTouching();
if (!mMoving) break;
mVelocityTracker.addMovement(event);
mVelocityTracker.computeCurrentVelocity(1000 /* units */);
final float velocity = isLandscape
? mVelocityTracker.getXVelocity()

View File

@@ -521,12 +521,14 @@ public class DividerView extends FrameLayout implements OnTouchListener,
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
mVelocityTracker.addMovement(event);
if (!mMoving) break;
if (!mMoving) {
stopDragging();
break;
}
x = (int) event.getRawX();
y = (int) event.getRawY();
mVelocityTracker.addMovement(event);
mVelocityTracker.computeCurrentVelocity(1000);
int position = calculatePosition(x, y);
stopDragging(position, isHorizontalDivision() ? mVelocityTracker.getYVelocity()