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

Merge "Fix not releasing touching state of the handle on divider bar" into sc-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-05-19 00:08:08 +00:00
committed by Android (Google) Code Review
parent 20e75f17e5 49b3cc5bd4
commit 6c2ffa9595
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java
View File

@@ -131,11 +131,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()

8
libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java
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()