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

Commit 245b4537 authored by Jim Miller's avatar Jim Miller
Browse files

Properly handle cancel event in GlowPadView 

There was a workaround used in a previous release where we effectively
ignored cancel events to work around another bug.  This change removes
the workaround and GlowPadView correctly handles the event.

Bug 6903638

Change-Id: I9b510985c6da346a4e10cf2535267c8d5efa5871
parent b8831168

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

+2 −6
Original line number Diff line number Diff line
@@ -803,12 +803,8 @@ public class GlowPadView extends View { 
    private void handleCancel(MotionEvent event) {

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



        // We should drop the active target here but it interferes with

        // moving off the screen in the direction of the navigation bar. At some point we may

        // want to revisit how we handle this. For now we'll allow a canceled event to

        // activate the current target.



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

        // Drop the active target if canceled.

        mActiveTarget = -1; 



        int actionIndex = event.findPointerIndex(mPointerId);

        actionIndex = actionIndex == -1 ? 0 : actionIndex;