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

Commit c7aab1a9 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5907223: Fix lock screen glitch caused on devices with a system bar"

parents ec99f609 bf032650

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

+7 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ public class MultiWaveView extends View { 


            case MotionEvent.ACTION_CANCEL:

                handleMove(event);

                handleCancel(event);

                handled = true;

                break;

        }
@@ -679,6 +680,12 @@ public class MultiWaveView extends View { 
        switchToState(STATE_FINISH, event.getX(), event.getY());

    }

    

    private void handleCancel(MotionEvent event) {

        if (DEBUG && mDragging) Log.v(TAG, "** Handle CANCEL");

        mActiveTarget = -1; // Drop the active target if canceled.

        switchToState(STATE_FINISH, event.getX(), event.getY());

    }



    private void handleMove(MotionEvent event) {

        if (!mDragging) {

            trySwitchToFirstTouchState(event);