Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2ffa95 authored by Jerry Chang's avatar Jerry Chang Committed by Android (Google) Code Review
Browse files

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

parents 20e75f17 49b3cc5b

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

+1 −2
Original line number Diff line number Diff line
@@ -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()

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java

+5 −3
Original line number Diff line number Diff line
@@ -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()