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

Commit 6b9cd4d2 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 8215ddb4: Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev

* commit '8215ddb4':
  Properly handle cancel event in GlowPadView
parents a009ee22 8215ddb4
Loading
Loading
Loading
Loading
+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;